Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorSergey BELASH <belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000 (16:12 +0400)
committerSergey BELASH <belash.sergey@opencascade.com>
Mon, 18 Aug 2014 12:12:23 +0000 (16:12 +0400)
commit57c61908ce2c9d9386762d76c7606eeaa7f8a48c
treeeaef0662fb720244d6e008ddd427ace29511aebe
parente2d08c172f34ca33d9fae1999738b6067e757ae6
parent81bf735c62faafde506ba94930f7e573573762c8
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/XGUI/XGUI_MainMenu.cpp