Johannes Ruehle d1a86779b6 Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch %!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 d1a86779b6 Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch %!s(int64=11) %!d(string=hai) anos
iceconversion 7e01ba00c9 init %!s(int64=12) %!d(string=hai) anos
image d653d45cb6 merged cmake with master %!s(int64=11) %!d(string=hai) anos
imagedisplay ec87b86fbb merged %!s(int64=12) %!d(string=hai) anos
matlabAccess 4cc338c4f3 cmake cleanup of temporary files %!s(int64=12) %!d(string=hai) anos
optimization 4cc338c4f3 cmake cleanup of temporary files %!s(int64=12) %!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 1ed5fd0ef7 fixed using external lib ImageMagick for proper image loading %!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
corefiles.cmake 332cf4fccd cmakelist update %!s(int64=12) %!d(string=hai) anos
progfiles.cmake 332cf4fccd cmakelist update %!s(int64=12) %!d(string=hai) anos
testfiles.cmake 332cf4fccd cmakelist update %!s(int64=12) %!d(string=hai) anos