TadasBaltrusaitis 58daee692e Merge branch 'master' into feature/DCCNF ...

# Conflicts:
#	.gitignore
#	exe/FaceLandmarkImg/FaceLandmarkImg.cpp
#	exe/FeatureExtraction/FeatureExtraction.cpp
#	matlab_runners/Feature Point Experiments/results/in-the-wild-res-no-outline.pdf
#	matlab_runners/Feature Point Experiments/results/landmark_detections.mat
#	matlab_runners/Feature Point Experiments/run_OpenFace_feature_point_tests_300W.m
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat

2017-04-10 11:04:30 -04:00

..

FaceLandmarkImg

Merge branch 'master' into feature/DCCNF

2017-04-10 11:04:30 -04:00

FaceLandmarkVid

Merge branch 'master' into feature/DCCNF

2017-04-10 11:04:30 -04:00

FaceLandmarkVidMulti

Merge branch 'master' into feature/DCCNF

2017-04-10 11:04:30 -04:00

FeatureExtraction

Merge branch 'master' into feature/DCCNF

2017-04-10 11:04:30 -04:00

Recording

Corrections for output, faster compilation in VS2015, retuning experiments.

2016-08-01 13:39:52 -04:00