Tadas Baltrusaitis fa76d9051c Merge branch 'master' into feature/Windows-GUI ... Conflicts: matlab_runners/Demos/feature_extraction_demo_vid.m		2017-05-15 13:19:11 -04:00
..
CMakeLists.txt	Fix install in CMakeLists.txt files	2016-08-01 11:34:23 +02:00
FaceLandmarkImg.cpp	Merge branch 'master' into feature/Windows-GUI	2017-05-15 13:19:11 -04:00
FaceLandmarkImg.vcxproj	Corrections for output, faster compilation in VS2015, retuning experiments.	2016-08-01 13:39:52 -04:00
FaceLandmarkImg.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00