Salome HOME
Merge branch 'MessagesGroups'
authormpv <mikhail.ponikarov@opencascade.com>
Thu, 22 May 2014 14:15:29 +0000 (18:15 +0400)
committermpv <mikhail.ponikarov@opencascade.com>
Thu, 22 May 2014 14:15:29 +0000 (18:15 +0400)
commitd0350421b47740df5540b8165ac7643657cccf66
treee8b66afbd20f0b780d6700a2a672ace6f4593075
parent1817e423651c01861813557bc76b69f4aafa4e53
parent582c30d5a6ba4624022c04107809428d594b9245
Merge branch 'MessagesGroups'

Conflicts:
src/SketchSolver/SketchSolver_ConstraintManager.cpp
src/Model/Model_Document.cpp
src/SketchSolver/SketchSolver_ConstraintManager.cpp
src/XGUI/XGUI_Workshop.cpp