]> OCCT Git - occt-copy.git/commit
Merge remote branch 'origin/CR25129_671_1' into CR00000-HYDRO_3 CR00000-HYDRO_3
authorasl <alexander.solovyov@opencascade.com>
Wed, 10 Sep 2014 04:33:53 +0000 (08:33 +0400)
committerasl <alexander.solovyov@opencascade.com>
Wed, 10 Sep 2014 04:33:53 +0000 (08:33 +0400)
commit916891134113b9519b601271d3e81b3864bb0b49
tree48830ba30c875b05f2baaca6590c11dc027cb34e
parent573a844b930ff2f907369c63181141f3d6d1749b
parent6635afb0c0035add53f6b5641bce65717fa06d7d
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