Tadas Baltrusaitis 5d5947a41d Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace ... Conflicts: .gitignore		2016-07-22 12:36:11 -04:00
..
FaceLandmarkImg	Update CMakeLists.txt	2016-07-11 16:11:02 -04:00
FaceLandmarkVid	Update CMakeLists.txt	2016-07-11 16:12:34 -04:00
FaceLandmarkVidMulti	Update CMakeLists.txt	2016-07-11 16:13:37 -04:00
FeatureExtraction	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace	2016-07-22 12:36:11 -04:00
Recording	Master commit of OpenFace.	2016-04-28 15:40:36 -04:00