Merge remote-tracking branch 'origin/BR_SHP_FORMAT2' into BR_LAND_COVER_MAP

author asl <asl@opencascade.com>

Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)

committer asl <asl@opencascade.com>

Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)
author asl <asl@opencascade.com>
Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)
committer asl <asl@opencascade.com>
Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)
diff --cc src/HYDROGUI/HYDROGUI_Operations.cxx
Simple merge
author	asl <asl@opencascade.com>
	Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)
committer	asl <asl@opencascade.com>
	Tue, 10 Nov 2015 04:43:56 +0000 (07:43 +0300)