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
..
Record.cpp	Auto stash before merge of "develop" and "origin/develop"	2017-05-08 21:36:23 -04:00
Recording.vcxproj	Corrections for output, faster compilation in VS2015, retuning experiments.	2016-08-01 13:39:52 -04:00
Recording.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00