Commit 107a5055 authored by mostajab's avatar mostajab
Browse files

Merge branch 'DataInspector' of campgit.in.tum.de:berge/campvis into DataInspector

Resolved Conflicts:
	application/gui/datacontainerinspectorcanvas.cpp
	application/gui/datacontainerinspectorcanvas.h
	application/gui/datacontainerinspectorwidget.cpp
	application/gui/datacontainerinspectorwidget.h
	core/datastructures/imagerepresentationgl.cpp
parents 36f4fa08 52e64453
Markdown is supported
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