Salome HOME
Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc
authorasl <asl@opencascade.com>
Thu, 25 Jun 2015 07:26:04 +0000 (10:26 +0300)
committerasl <asl@opencascade.com>
Thu, 25 Jun 2015 07:26:04 +0000 (10:26 +0300)
commitc0d628b2e1f42a693a91c1054f42dcfd36a054e5
treef8a877ff3adb0cfff1596f2582307f7a0a8b02a9
parenta01c3bc49508b7b5dacffc52456554c80f262ad8
parent97ebc30aaa325672608fb2dd4bc9bc33225aa12f
Merge remote-tracking branch 'origin/BR_SHP_FORMAT' into BR_v14_rc

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