Commit graph

4 commits

Author SHA1 Message Date
Tadas Baltrusaitis
fa76d9051c Merge branch 'master' into feature/Windows-GUI
Conflicts:
	matlab_runners/Demos/feature_extraction_demo_vid.m
2017-05-15 13:19:11 -04:00
Tadas Baltrusaitis
305af01326 Auto stash before merge of "develop" and "origin/develop"
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Tadas Baltrusaitis
9900e8b0de Simplifying head pose estimation. 2016-11-23 17:17:26 -05:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00