# Conflicts:
#	Superbuild/CMakeLists.txt
#	Superbuild/Projects/boost.cmake
#	Superbuild/Projects/pcl.cmake
#	Superbuild/Projects/veloview.cmake
#	Superbuild/versions.cmake
#	VelodyneHDL/CMakeLists.txt
#	VelodyneHDL/IO/GPS-IMU/Velodyne/vtkVelodyneHDLPositionReader.cxx
#	VelodyneHDL/IO/Lidar/KITTIDataSet/vtkLidarKITTIDataSetReader.cxx
#	VelodyneHDL/python/veloview/applogic.py
#	vvMainWindow.cxx
#	vvResources.qrc
#	vvToggleSpreadSheetReaction.cxx