]> OCCT Git - occt-copy.git/commit
Resolving merge errors. CR0-AVD-NEW-1
authoromy <omy@opencascade.com>
Mon, 31 Aug 2015 14:23:35 +0000 (17:23 +0300)
committeromy <omy@opencascade.com>
Mon, 31 Aug 2015 14:31:28 +0000 (17:31 +0300)
commita1873a98ec32fd5b120f545a163bb335f9a10016
tree9bdab5e12657df37741728aab6f17b50b550b07e
parentcccf89f3614263b716ca7e66683910470e831b77
Resolving merge errors.
12 files changed:
src/Graphic3d/Graphic3d_Camera.cxx
src/Graphic3d/Graphic3d_Group.hxx
src/Graphic3d/Graphic3d_TransferFunction.cxx
src/Graphic3d/Graphic3d_TransferFunction.hxx
src/Graphic3d/Graphic3d_Volume.cxx
src/Graphic3d/Graphic3d_Volume.hxx
src/Graphic3d/Graphic3d_VolumeData.cxx
src/Graphic3d/Graphic3d_VolumeData.hxx
src/OpenGl/FILES
src/Voxel/Handle_Voxel_Prs.hxx
src/Voxel/Voxel_Prs.cxx
src/Voxel/Voxel_Prs.hxx