Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Thu, 12 Feb 2015 14:36:11 +0000 (17:36 +0300)
committersbh <sergey.belash@opencascade.com>
Thu, 12 Feb 2015 14:36:11 +0000 (17:36 +0300)
commitb69a4c4ae0f7eb0e9c17d3db0229b04b1fe77ecf
treeef6ef42ce8ab3e15bd01ee7c334df97e6932d58a
parent6c11e01149120ed3cbdb92d39ceb34e49e6670ae
parent7f4f4c9b4ee9a6fdcf0b915621b8ebdc9d74dbda
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
src/AppElements/AppElements_Command.cpp
src/XGUI/XGUI_Workshop.cpp