Merge branch 'develop'

This commit is contained in:
Tadas Baltrusaitis
2016-07-22 13:29:17 -04:00
872 changed files with 15512 additions and 529 deletions

6
.gitignore vendored
View File

@@ -28,3 +28,9 @@ exe/FeatureExtraction/out_bp4d/
matlab_runners/Action Unit Experiments/out_bp4d/
matlab_runners/Action Unit Experiments/out_SEMAINE/
x64/Debug/
matlab_runners/Action Unit Experiments/out_unbc/
matlab_runners/Action Unit Experiments/out_bosph/
matlab_runners/Action Unit Experiments/out_DISFA/
matlab_runners/Action Unit Experiments/out_fera/
matlab_runners/Demos/output_features_seq/
matlab_runners/Demos/output_features_vid/