]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorSergey Belash <sergey.belash@opencascade.com>
Thu, 13 Mar 2014 13:04:05 +0000 (17:04 +0400)
committerSergey Belash <sergey.belash@opencascade.com>
Thu, 13 Mar 2014 13:04:05 +0000 (17:04 +0400)
commitcea3f78cfb7c796ba5be6bc9ee21e930abe14021
tree1de8b2fb76b3edbf7a8fc8f0c0da9c082bf882da
parent86d4424c87cc0b95be289a43042ad698db633f9a
parentdcfbdb77dfd1e8f4f5a9f636ff5534d74af3592e
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
CMakeLists.txt
CMakeLists.txt
env.bat