From: asl <asl@opencascade.com>
Date: Wed, 21 Oct 2015 08:25:14 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_LAND_COVER_REMOVING' into BR_LAND_COVER_MAP
X-Git-Tag: v1.5~78
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e423cfd15575a1feb27386b5516bd0c83bed5fe9;p=modules%2Fhydro.git

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

Conflicts:
	src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.cxx
	src/HYDROGUI/HYDROGUI_ImportLandCoverDlg.h
	src/HYDRO_tests/TestViewer.cxx
---

e423cfd15575a1feb27386b5516bd0c83bed5fe9