Tadas Baltrusaitis 884a063ca7 Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI ... # Conflicts: # exe/FaceLandmarkImg/FaceLandmarkImg.cpp # exe/FeatureExtraction/FeatureExtraction.cpp # lib/local/FaceAnalyser/FaceAnalyser.vcxproj # lib/local/FaceAnalyser/include/FaceAnalyser.h # lib/local/FaceAnalyser/include/Face_utils.h # lib/local/FaceAnalyser/include/PAW.h # lib/local/FaceAnalyser/include/PDM.h # lib/local/FaceAnalyser/src/FaceAnalyser.cpp # lib/local/FaceAnalyser/src/FaceAnalyserParameters.cpp # lib/local/FaceAnalyser/src/Face_utils.cpp # lib/local/FaceAnalyser/src/PAW.cpp # lib/local/FaceAnalyser/src/PDM.cpp # lib/local/GazeAnalyser/include/GazeEstimation.h # lib/local/GazeAnalyser/src/GazeEstimation.cpp # lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h # lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp # matlab_runners/Action Unit Experiments/results/BP4D_valid_res_class.txt # matlab_runners/Action Unit Experiments/results/BP4D_valid_res_int.txt # matlab_runners/Action Unit Experiments/results/Bosphorus_res_class.txt # matlab_runners/Action Unit Experiments/results/Bosphorus_res_int.txt # matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m # matlab_runners/Demos/feature_extraction_demo_vid.m # matlab_runners/Full_test_suite.m		2017-10-24 08:29:32 +01:00
..
CMakeLists.txt	Fix install in CMakeLists.txt files	2016-08-01 11:34:23 +02:00
FaceLandmarkVid.cpp	Merge branch 'master' into feature/Windows-GUI	2017-10-18 03:01:47 -04:00
FaceLandmarkVid.vcxproj	Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI	2017-10-24 08:29:32 +01:00
FaceLandmarkVid.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00