From: asl <alexander.solovyov@opencascade.com>
Date: Wed, 10 Sep 2014 04:33:53 +0000 (+0400)
Subject: Merge remote branch 'origin/CR25129_671_1' into CR00000-HYDRO_3
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FCR00000-HYDRO_3;p=occt-copy.git

Merge remote branch 'origin/CR25129_671_1' into CR00000-HYDRO_3

Conflicts:
	src/AIS/AIS_PointCloud.cxx
	src/AIS/AIS_PointCloud.hxx
	src/ViewerTest/ViewerTest_ObjectCommands.cxx
---

916891134113b9519b601271d3e81b3864bb0b49