]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into BR_TEMP_PLUGIN
authorsbh <sergey.belash@opencascade.com>
Mon, 22 Dec 2014 16:37:04 +0000 (19:37 +0300)
committersbh <sergey.belash@opencascade.com>
Mon, 22 Dec 2014 16:37:04 +0000 (19:37 +0300)
commitdabd46d48c9aab36a705a88c1974acd325e7da17
treee5315836563b3880274996625344165192da7c1c
parenta15ee8fee405f016a310ff6e9a2977a60ca92b2a
parent031fb5e7c551e695afa72a9de299f118a40d8d88
Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into BR_TEMP_PLUGIN

Conflicts:
CMakeLists.txt
src/Config/plugins.xml
src/Config/plugins.xml