Sven Sickert a3b496b43d Merge branch 'mci3d_changes' %!s(int64=11) %!d(string=hai) anos
..
algebra d1a86779b6 Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch %!s(int64=11) %!d(string=hai) anos
basics e3d99880ef added to class Config: save filename of extracted config file; %!s(int64=11) %!d(string=hai) anos
iceconversion 7e01ba00c9 init %!s(int64=12) %!d(string=hai) anos
image a3b496b43d Merge branch 'mci3d_changes' %!s(int64=11) %!d(string=hai) anos
imagedisplay fcd9a1e946 added #ifdef for compiling without opengl and glut %!s(int64=11) %!d(string=hai) anos
matlabAccess bc860d6398 merged branches %!s(int64=11) %!d(string=hai) anos
optimization bc860d6398 merged branches %!s(int64=11) %!d(string=hai) anos
progs b3d13e9bda core/progs/imageDemo: do not call showImage if GLUT is not available %!s(int64=11) %!d(string=hai) anos
vector d1a86779b6 Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch %!s(int64=11) %!d(string=hai) anos
CMakeLists.txt 1fd28dbc1c cmake: fixes to OpenGL and GLUT lib usage %!s(int64=11) %!d(string=hai) anos
Makefile 7e01ba00c9 init %!s(int64=12) %!d(string=hai) anos
Makefile.inc 7e01ba00c9 init %!s(int64=12) %!d(string=hai) anos