]> SALOME platform Git repositories - modules/hydro.git/commit - src/HYDROGUI/HYDROGUI_Zone.cxx
Salome HOME
Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc
authorasl <asl@opencascade.com>
Mon, 25 May 2015 05:14:26 +0000 (08:14 +0300)
committerasl <asl@opencascade.com>
Mon, 25 May 2015 05:14:26 +0000 (08:14 +0300)
commitf0688b4c39fcc3e49c2b58a90724b9c1c84f1337
treefd15aab3fb40a46d12fe9cea0d96170fe6ef275d
parentd2d2eeaa78b59e8dff903cbaf1cdeb61b6e0de6a
parent61c346f5554c35a24c961c41bb31472187f88bb0
Merge remote-tracking branch 'origin/BR_IMPROVEMENTS' into BR_v14_rc

Conflicts:
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/CMakeLists.txt
src/HYDROGUI/HYDROGUI_Operations.cxx
src/HYDROGUI/HYDROGUI_Operations.h
src/HYDROGUI/resources/HYDROGUI_msg_en.ts