Tadas Baltrusaitis
|
0a5110a003
|
Merge branch 'master' into Windows-GUI
Conflicts:
.gitignore
matlab_runners/Action Unit Experiments/DISFA_valid_res.txt
matlab_runners/Feature Point Experiments/results/fps_yt.mat
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/Gaze Experiments/mpii_1500_errs.txt
matlab_runners/Head Pose Experiments/results/Pose_OF.mat
|
2016-10-03 18:11:05 -04:00 |
|