Commit Graph

6 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 c23db4b5e8 Fixes to camera loading. 2016-10-04 21:14:41 -04:00
Tadas Baltrusaitis 5416048697 Corrections for output, faster compilation in VS2015, retuning experiments. 2016-08-01 13:39:52 -04:00
Tadas Baltrusaitis 242ce8d130 Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows. 2016-07-29 13:04:25 -04:00
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00