Tadas Baltrusaitis 5d5947a41d Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace ... Conflicts: .gitignore		2016-07-22 12:36:11 -04:00
..
FaceAnalyser	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace	2016-07-22 12:36:11 -04:00
LandmarkDetector	Update CMakeLists.txt	2016-07-11 16:15:44 -04:00