Johannes Ruehle 65e09863dd Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-vislearning into cmake_mergemaster 11 lat temu
..
classifierbase 9143002676 Added virtual functions for VecClassifier and FeaturePoolClassifier, changes on VC-NN-classifier 12 lat temu
classifiercombination 34cd27cb20 moved mrf from objrec to vislearning 12 lat temu
classifierinterfaces 203e4a3021 image include files (imageDisplay.h and ImageT.h) causing errors due to ambiguities with Qt were put into .cpp files (and commenting them out if still harmful for compilation) 13 lat temu
fpclassifier 65e09863dd Merge branch 'master' of dbv.inf-cv.uni-jena.de:nice/nice-vislearning into cmake_mergemaster 11 lat temu
kernelclassifier 54d5633076 merged master 11 lat temu
progs 68dbcdb9f4 additional comments and bugfixes 13 lat temu
vclassifier a4de671279 Merge branch 'master' of /home/dbv/git/nice.git/vislearning into cmake 11 lat temu
Makefile 4f62dcb0ac added basics to vislearning and corrected the include paths 13 lat temu
Makefile.inc 4f62dcb0ac added basics to vislearning and corrected the include paths 13 lat temu
genericClassifierSelection.h 5a03386475 adapted GPHIKClassifier into FP-framework and corrected dependencies 12 lat temu
libdepend.inc 4f62dcb0ac added basics to vislearning and corrected the include paths 13 lat temu