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
..
include	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
model	Merge branch 'master' into feature/Windows-GUI	2017-10-18 03:01:47 -04:00
src	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
CMakeLists.txt	Make file fixes.	2017-12-17 08:49:12 +00:00
LandmarkDetector.vcxproj	Adding images for new wiki entries and some code for packaging releases.	2017-12-28 19:47:49 +00:00
LandmarkDetector.vcxproj.filters	Master commit of OpenFace.	2016-04-28 15:40:36 -04:00