Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 3 Sep 2014 08:33:31 +0000 (12:33 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 3 Sep 2014 08:33:31 +0000 (12:33 +0400)
commit542c9d721fbef80eb2040ef248fdd431cad2e631
tree645ee335167f78b07319267e0ae54e8bf31fff8e
parentb801d5f85aa3dc5786510acf87c8003f1d59eadd
parentaf168c107750e3c62fc487ae55b3ac9a1ab67435
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/ModuleBase/CMakeLists.txt
src/Config/Config_Keywords.h
src/ModuleBase/CMakeLists.txt