Merge branch 'master' of /home/dbv/git/nice/vislearning

matlabAccess/progs/testMatFileIO.cpp

@@ -12,8 +12,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "fast-hik/matio/src/matio.h"
-#include "fast-hik/MatFileIO.h"
+#include "vislearning/matlabAccess/matio/src/matio.h"
+#include "vislearning/matlabAccess/MatFileIO.h"
 
 using namespace std;
 using namespace NICE;