Salome HOME
Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION
authormzn <mzn@opencascade.com>
Tue, 2 Jun 2015 08:07:14 +0000 (11:07 +0300)
committermzn <mzn@opencascade.com>
Tue, 2 Jun 2015 08:07:14 +0000 (11:07 +0300)
commit13de13fcc64a32cb0f455ec3245251f98df0e990
tree1eac57abf0d82fc32f49b1c894f4b4297f8252c7
parent2fe8190c31b4be5a6b7b9ba2e7195dc4ab64c87f
parentfca39760e413624def0d677805236ae88ac7fd23
Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

Conflicts:
src/HYDROGUI/HYDROGUI_Shape.cxx
src/HYDROGUI/HYDROGUI_Module.cxx
src/HYDROGUI/HYDROGUI_Shape.cxx
src/HYDROGUI/resources/HYDROGUI_msg_en.ts