Merge remote-tracking branch 'origin/BR_v14_rc' into BR_SHAPE_RECOGNITION

author mzn <mzn@opencascade.com>

Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)

committer mzn <mzn@opencascade.com>

Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)
author mzn <mzn@opencascade.com>
Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)
committer mzn <mzn@opencascade.com>
Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)
diff --cc src/HYDROGUI/HYDROGUI_Module.cxx
Simple merge
author	mzn <mzn@opencascade.com>
	Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)
committer	mzn <mzn@opencascade.com>
	Mon, 25 May 2015 12:24:40 +0000 (15:24 +0300)