Erik Rodner 9d3f779306 Merge branch 'master' of /home/dbv/git/nice/vislearning 13 éve
..
Makefile.inc 4f62dcb0ac added basics to vislearning and corrected the include paths 13 éve
config 4f62dcb0ac added basics to vislearning and corrected the include paths 13 éve
square_black.jpg 4f62dcb0ac added basics to vislearning and corrected the include paths 13 éve
testPHOGFeatures.cpp 68dbcdb9f4 additional comments and bugfixes 13 éve