]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN
authorsbh <sergey.belash@opencascade.com>
Tue, 25 Nov 2014 09:10:42 +0000 (12:10 +0300)
committersbh <sergey.belash@opencascade.com>
Tue, 25 Nov 2014 09:10:42 +0000 (12:10 +0300)
commit35a88fdd724349275bbff32b9596a44e7cd422e2
treef7abba1a7506dec01c863a24af1ff7cee5317719
parente7ee60119a1f8b1dbbff52a788ea548eacd96aa2
parent1264006edf1221473f3a70ef31bcee6bbf78d23b
Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN

Conflicts:
src/ModelAPI/ModelAPI.i
src/ModelAPI/ModelAPI_Session.cpp
CMakeLists.txt
msvc10_env.bat
src/Events/Events_Loop.cpp
src/Model/Model_Session.cpp
src/ModelAPI/ModelAPI.i
src/ModelAPI/ModelAPI_Plugin.h
src/ModelAPI/ModelAPI_Session.cpp
src/ModelAPI/ModelAPI_Session.h