sustaining_gazes/lib/local/LandmarkDetector
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
..
include Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
model Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
src Merge branch 'master' into feature/Windows-GUI 2017-10-18 03:01:47 -04:00
CMakeLists.txt Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake 2016-12-29 23:36:10 +00:00
LandmarkDetector.vcxproj Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
LandmarkDetector.vcxproj.filters Master commit of OpenFace. 2016-04-28 15:40:36 -04:00