Salome HOME
Merge remote-tracking branch 'remotes/origin/master' into SketchSolver
authorazv <azv@opencascade.com>
Thu, 5 Jun 2014 11:09:28 +0000 (15:09 +0400)
committerazv <azv@opencascade.com>
Thu, 5 Jun 2014 11:09:28 +0000 (15:09 +0400)
commitae347a8a8014a15245199a3bb603413628e3f7d4
tree1f83487e228f266fefb6f8d092ea379bd7ede24e
parentb035864efaaa03ffcf5a3aa32d20f84f5d6ddc58
parent3dd47d328c0457caf0ed74568f159ffef43ffb42
Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

Conflicts:
src/GeomAlgoAPI/CMakeLists.txt
src/GeomAlgoAPI/CMakeLists.txt
src/SketchPlugin/SketchPlugin_Sketch.cpp