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
..
Record.cpp	Auto stash before merge of "develop" and "origin/develop"	2017-05-08 21:36:23 -04:00
Recording.vcxproj	Starting work on a separate recorder, this will allow for a nicer separation of executables and utilities and make it much easier to integrate with the GUI as it will not rely on it's own recorder.	2017-11-01 19:39:49 +00:00
Recording.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00