]> SALOME platform Git repositories - modules/gui.git/commit
Salome HOME
Merge remote-tracking branch 'origin/V7_8_BR' into hydro/imps_2015 hydro/imps_2015
authorasl <asl@opencascade.com>
Mon, 5 Dec 2016 07:59:08 +0000 (10:59 +0300)
committerasl <asl@opencascade.com>
Mon, 5 Dec 2016 07:59:08 +0000 (10:59 +0300)
commite1bbd3529c5ed6c65adfd80571a411e902dc13a7
treebe0955b85a9d79760a560cd1141fed510af56a5f
parentdd368420793ca8fc06addb7ebc4786e8b9075747
parent14fcfb990f23e6a8c9fc51bce6a3f539d386337c
Merge remote-tracking branch 'origin/V7_8_BR' into hydro/imps_2015

Conflicts:
CMakeLists.txt
src/SalomeApp/salome_pluginsmanager.py
CMakeLists.txt
doc/salome/tui/doxyfile.in