Tadas Baltrusaitis b224fcdfc9 Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI ... # Conflicts: # .gitignore # exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp # lib/local/FaceAnalyser/FaceAnalyser.vcxproj # lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h # lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp # matlab_runners/Demos/feature_extraction_demo_vid.m # matlab_runners/Demos/gaze_extraction_demo_vid.m		2017-12-29 16:27:00 +00:00
..
CMakeLists.txt	Adapting Cmake to new interface.	2017-12-13 17:50:48 +00:00
FaceLandmarkImg.cpp	Bringing all of the experiments to a new interface	2017-12-16 13:14:02 +00:00
FaceLandmarkImg.vcxproj	Adding images for new wiki entries and some code for packaging releases.	2017-12-28 19:47:49 +00:00
FaceLandmarkImg.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00