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	Code cleanup with visualization.	2017-11-14 07:54:02 +00:00
src	Code cleanup with visualization.	2017-11-14 07:54:02 +00:00
CMakeLists.txt	Make file fixes.	2017-12-17 08:49:12 +00:00
GazeAnalyser.vcxproj	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-12-29 16:27:00 +00:00
GazeAnalyser.vcxproj.filters	Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches.	2017-10-26 08:50:15 +01:00