Salome HOME
Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN
authorSergey BELASH <belash.sergey@opencascade.com>
Wed, 29 Oct 2014 16:13:17 +0000 (19:13 +0300)
committerSergey BELASH <belash.sergey@opencascade.com>
Wed, 29 Oct 2014 16:13:17 +0000 (19:13 +0300)
commit758a57d77b6fa3a0485fa3378a1280c7e87a74aa
treef1eb2bf04addd964a44de4e0e6feca510825a5c0
parent355e36702c9bdfc5316e9dc86a4eaf4a1e004be2
parentbca0d6dc03d998fb8fe24a0003f7b392b403ea11
Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN

Conflicts:
linux_env.sh
src/FeaturesPlugin/CMakeLists.txt
src/ModelAPI/ModelAPI.i
linux_env.sh
src/Model/Model_Session.cpp
src/ModelAPI/ModelAPI.i