Laurent Rineau 6d892480be Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF ...

Conflicts:
	CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt
	Installation/changes.html

2015-07-10 18:05:25 +02:00

..

CMakeLists.txt

Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF

2015-07-10 18:05:25 +02:00

image_to_vtk_viewer.cpp

Merge branch 'lrineau/CGAL_ImageIO-fix_VTK_6_support-lrineau' into CGAL-Qt5_support-GF

2015-07-10 18:05:25 +02:00