Tadas Baltrusaitis a4f6cd177d Merge branch 'master' into OpenFaceC ...

# Conflicts:
#	.gitignore
#	matlab_runners/Action Unit Experiments/results/DISFA_valid_res.txt
#	matlab_runners/Feature Point Experiments/results/300VW_66.txt
#	matlab_runners/Feature Point Experiments/results/fps_yt.txt
#	matlab_runners/Gaze Experiments/mpii_1500_errs.mat
#	matlab_runners/Gaze Experiments/mpii_1500_errs.txt
#	matlab_runners/Head Pose Experiments/results/Pose_OF_CECLM.txt

2018-05-23 21:35:28 +01:00

..

3rdParty

Moving to OpenFace 2.0! Loads of changes.

2018-05-10 20:45:52 +01:00

local

Merge branch 'master' into OpenFaceC

2018-05-23 21:35:28 +01:00