sustaining_gazes/matlab_runners/Action Unit Experiments/results
Tadas Baltrusaitis 0de2379463 Merge branch 'master' into feature/Windows-GUI
# Conflicts:
#	.gitignore
#	exe/FaceLandmarkVid/FaceLandmarkVid.cpp
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	lib/local/FaceAnalyser/src/FaceAnalyser.cpp
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt
#	matlab_runners/Action Unit Experiments/results/FERA2011_res_class.txt
#	matlab_runners/Action Unit Experiments/results/SEMAINE_valid_res.txt
#	matlab_runners/Demos/Read_HOG_file.m
#	matlab_runners/Demos/feature_extraction_demo_img_seq.m
#	matlab_runners/Feature Point Experiments/results/fps_yt.mat
#	matlab_runners/Feature Point Experiments/results/fps_yt.txt
#	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
#	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
#	matlab_runners/Head Pose Experiments/results/Pose_OF.mat
#	matlab_runners/Head Pose Experiments/results/Pose_OF.txt
2017-10-18 03:01:47 -04:00
..
Bosphorus_res_class.txt Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
Bosphorus_res_int.txt Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
BP4D_valid_res_class.txt Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
BP4D_valid_res_int.txt Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
DISFA_valid_res.txt Newest results. 2017-09-11 08:03:29 +01:00
DISFA_valid_res_back.txt A lot of changes: 2016-07-22 09:35:50 -04:00
FERA2011_res_class.txt Newest results. 2017-09-11 08:03:29 +01:00
SEMAINE_valid_res.txt Newest results. 2017-09-11 08:03:29 +01:00
UNBC_valid_res_int.txt Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00