| .. |
|
algebra
|
d1a86779b6
Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch
|
11 vuotta sitten |
|
basics
|
67352e83d6
minor merge fix
|
11 vuotta sitten |
|
iceconversion
|
7e01ba00c9
init
|
12 vuotta sitten |
|
image
|
bc860d6398
merged branches
|
11 vuotta sitten |
|
imagedisplay
|
ec87b86fbb
merged
|
12 vuotta sitten |
|
matlabAccess
|
bc860d6398
merged branches
|
11 vuotta sitten |
|
optimization
|
bc860d6398
merged branches
|
11 vuotta sitten |
|
progs
|
b3d13e9bda
core/progs/imageDemo: do not call showImage if GLUT is not available
|
11 vuotta sitten |
|
vector
|
d1a86779b6
Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-core into cmake_mergebranch
|
11 vuotta sitten |
|
CMakeLists.txt
|
1ed5fd0ef7
fixed using external lib ImageMagick for proper image loading
|
11 vuotta sitten |
|
Makefile
|
7e01ba00c9
init
|
12 vuotta sitten |
|
Makefile.inc
|
7e01ba00c9
init
|
12 vuotta sitten |
|
corefiles.cmake
|
332cf4fccd
cmakelist update
|
12 vuotta sitten |
|
progfiles.cmake
|
332cf4fccd
cmakelist update
|
12 vuotta sitten |
|
testfiles.cmake
|
332cf4fccd
cmakelist update
|
12 vuotta sitten |
Johannes Ruehle
67352e83d6
minor merge fix