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