sustaining_gazes/lib/local/LandmarkDetector/src
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
..
CCNF_patch_expert.cpp Auto stash before merge of "develop" and "origin/develop" 2017-05-08 21:36:23 -04:00
LandmarkDetectionValidator.cpp Some big changes: 2017-08-01 17:11:02 -04:00
LandmarkDetectorFunc.cpp Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
LandmarkDetectorModel.cpp Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
LandmarkDetectorParameters.cpp Bug fix when -gaze is used. 2017-09-19 10:18:57 +01:00
LandmarkDetectorUtils.cpp Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
Patch_experts.cpp Some big changes: 2017-08-01 17:11:02 -04:00
PAW.cpp Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
PDM.cpp Big restructure of the code, moving closer to a new version with a GUI: 2017-05-18 17:04:38 -04:00
stdafx.cpp Auto stash before merge of "develop" and "origin/develop" 2017-05-08 21:36:23 -04:00
SVR_patch_expert.cpp Auto stash before merge of "develop" and "origin/develop" 2017-05-08 21:36:23 -04:00