Commit ce99305d authored by Hossain Mahmud's avatar Hossain Mahmud
Browse files

Merge branch 'dev-mahmud' of https://campgit.in.tum.de/berge/campvis into dev-mahmud

Conflicts:
	modules/io/processors/abstractimagereader.cpp
	modules/io/processors/abstractimagereader.h
	modules/io/processors/csvdimagereader.cpp
	modules/io/processors/csvdimagereader.h
	modules/io/processors/genericimagereader.cpp
	modules/io/processors/genericimagereader.h
	modules/io/processors/ltfimagereader.cpp
	modules/io/processors/ltfimagereader.h
	modules/io/processors/mhdimagereader.cpp
	modules/io/processors/mhdimagereader.h
	modules/io/processors/rawimagereader.cpp
	modules/io/processors/rawimagereader.h
	modules/io/processors/vtkimagereader.cpp
	modules/io/processors/vtkimagereader.h
parents aa39fc31 f29fd4b1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment