Skip to content
Find file Blame History Permalink
  • Peter Karasev's avatar
    Merge branch 'master' of gitlab.kitware.com:vtk/vtk into vtkOBJImporter-robustify-and-cleanup · a26dc789
    Peter Karasev authored 
    Conflicts:
	Common/Core/Testing/Python/TestEmptyInput.py
	IO/Import/vtkOBJImporter.cxx
	IO/Import/vtkOBJImporterInternals.cxx
	Rendering/Core/vtkLabeledContourMapper.cxx
	Rendering/External/vtkExternalOpenGLRenderer.cxx
	Rendering/External/vtkExternalOpenGLRenderer.h
	Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.cxx
	Rendering/OpenGL2/vtkGenericOpenGLRenderWindow.h
	Rendering/Volume/Testing/Cxx/CMakeLists.txt
    a26dc789