Merge branch 'campvis-nx' of gitlab.lrz.de:weiss/campvis-nx into campvis-nx
# Conflicts: # ext/cgt/texture.cpp
Showing
core/tools/cshelper.cpp
0 → 100644
core/tools/cshelper.h
0 → 100644
ext/cgt/imageunit.cpp
0 → 100644