Tadas Baltrusaitis 5d5947a41d Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace ... Conflicts: .gitignore		2016-07-22 12:36:11 -04:00
..
CMakeLists.txt	Update CMakeLists.txt	2016-07-11 16:14:36 -04:00
FeatureExtraction.cpp	More work at establishing AU baselines on SEMAINE and BP4D datasets.	2016-05-24 16:51:18 -04:00
FeatureExtraction.vcxproj	Changing project settings to allow for older CPUs without AVX2 instruction set.	2016-06-11 11:57:54 -04:00