]> SALOME platform Git repositories - modules/hydro.git/commit
Salome HOME
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT
authorisn <isn@opencascade.com>
Thu, 18 Jun 2015 11:13:41 +0000 (14:13 +0300)
committerisn <isn@opencascade.com>
Thu, 18 Jun 2015 11:13:41 +0000 (14:13 +0300)
commitdf3470544e7f6ee312e7c2967b965ab4227f56e5
treede3a1bae80caafadd3c2a48a1a6a92235c310390
parent982c1e44246794c1eca6b536b4c2d08092f55054
parentdeff0cc196a4223cf478e3098468821d0f173641
Merge branch 'BR_v14_rc' into BR_SINUSX_FORMAT

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