Salome HOME
Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP
authorasl <asl@opencascade.com>
Thu, 15 Oct 2015 13:43:57 +0000 (16:43 +0300)
committerasl <asl@opencascade.com>
Thu, 15 Oct 2015 13:43:57 +0000 (16:43 +0300)
commite744ba34fd38d6744d11b54cd15b6f86350695b2
tree3c689a53a1b1207c4e192c09d82b413a00cdbeb4
parent1834187d193fa93a6ac31967ae2fbebf15853888
parent091686637e5b8a5faa6ba788264e20e57a2d74fb
Merge remote-tracking branch 'origin/master' into BR_LAND_COVER_MAP

Conflicts:
src/HYDROData/HYDROData_Entity.cxx
src/HYDROData/HYDROData_Object.cxx
src/HYDROData/HYDROData_StricklerTable.cxx
src/HYDROData/HYDROData_Tool.h
29 files changed:
src/HYDROData/HYDROData_CalculationCase.cxx
src/HYDROData/HYDROData_Channel.cxx
src/HYDROData/HYDROData_Confluence.cxx
src/HYDROData/HYDROData_Entity.cxx
src/HYDROData/HYDROData_Entity.h
src/HYDROData/HYDROData_IAltitudeObject.cxx
src/HYDROData/HYDROData_IPolyline.cxx
src/HYDROData/HYDROData_Image.cxx
src/HYDROData/HYDROData_ImmersibleZone.cxx
src/HYDROData/HYDROData_LandCover.cxx
src/HYDROData/HYDROData_NaturalObject.cxx
src/HYDROData/HYDROData_Object.cxx
src/HYDROData/HYDROData_Object.h
src/HYDROData/HYDROData_Obstacle.cxx
src/HYDROData/HYDROData_Polyline3D.cxx
src/HYDROData/HYDROData_PolylineXY.cxx
src/HYDROData/HYDROData_Profile.cxx
src/HYDROData/HYDROData_River.cxx
src/HYDROData/HYDROData_ShapesGroup.cxx
src/HYDROData/HYDROData_Stream.cxx
src/HYDROData/HYDROData_StricklerTable.cxx
src/HYDROData/HYDROData_Tool.cxx
src/HYDROData/HYDROData_Tool.h
src/HYDROData/HYDROData_Zone.cxx
src/HYDROGUI/HYDROGUI_CalculationOp.cxx
src/HYDROGUI/HYDROGUI_ChannelOp.cxx
src/HYDROGUI/HYDROGUI_LandCoverOp.cxx
src/HYDROGUI/HYDROGUI_ProfileOp.cxx
src/HYDROGUI/HYDROGUI_StreamOp.cxx