]> OCCT Git - occt-copy.git/commitdiff
projects / occt-copy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 573a844 6635afb)
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)
Conflicts:
src/AIS/AIS_PointCloud.cxx
src/AIS/AIS_PointCloud.hxx
src/ViewerTest/ViewerTest_ObjectCommands.cxx


Trivial merge
Test copy of Open CASCADE Technology repository