Johannes Ruehle 0b30d288ce Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_globalsources %!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 940b310eec bugfix isfinite() %!s(int64=11) %!d(string=hai) anos
iceconversion 7e01ba00c9 init %!s(int64=12) %!d(string=hai) anos
image 0b30d288ce Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_globalsources %!s(int64=11) %!d(string=hai) anos
imagedisplay ec87b86fbb merged %!s(int64=12) %!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 86f2f2fe44 cmake: added recursive source file scan, added doc of cmake build functions %!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