]> SALOME platform Git repositories - modules/hydro.git/commit
Salome HOME
Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT
authorisn <isn@opencascade.com>
Tue, 23 Jun 2015 08:36:17 +0000 (11:36 +0300)
committerisn <isn@opencascade.com>
Tue, 23 Jun 2015 08:36:17 +0000 (11:36 +0300)
commit91509fc95d80a88365f84eb941df6139d8a87dde
treee15679d7ad55b196eaaa042f34ee858252935257
parent6b065fea005c70b9c7393b90c0b1bb4f0efb0f63
parentd52fc1b4428fafbe7e30652440f897032b679d36
Merge remote-tracking branch 'remotes/origin/BR_v14_rc' into BR_SHP_FORMAT

Conflicts:
src/HYDROGUI/resources/HYDROGUI_msg_en.ts
src/HYDROGUI/resources/HYDROGUI_msg_en.ts