Tadas Baltrusaitis 5d5947a41d Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace ... Conflicts: .gitignore		2016-07-22 12:36:11 -04:00
..
3rdParty	Changing project settings to allow for older CPUs without AVX2 instruction set.	2016-06-11 11:57:54 -04:00
local	Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace	2016-07-22 12:36:11 -04:00