Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 2 Apr 2014 12:40:42 +0000 (16:40 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 2 Apr 2014 12:40:42 +0000 (16:40 +0400)
commit499d70af8b5a0301b1d1260dc19455dc4fab7978
tree40b9d2e4e390bc6c73a4c3993e1ca82ebeae79bc
parentfe79131481b143cb13ff6a4ae1aab0b05fa8ab53
parent1a0a0306f6d0f56c009b29cba0b53e8d1abd4edf
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/ModelAPI/CMakeLists.txt
src/ModelAPI/CMakeLists.txt