Tadas Baltrusaitis 67bf8706de Merge branch 'develop' into feature/Windows-GUI ... # Conflicts: # OpenFace.sln # lib/local/FaceAnalyser/FaceAnalyser.vcxproj.filters # lib/local/GazeAnalyser/GazeAnalyser.vcxproj		2017-10-26 17:42:43 +01:00
..
AU_predictors	AU prediction de-coupling from landmark detection modules, allowing different PDMs to be used (or a different 68 point detector altogether).	2017-10-23 17:58:35 +01:00
include	Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches.	2017-10-26 08:50:15 +01:00
src	Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches.	2017-10-26 08:50:15 +01:00
CMakeLists.txt	removing old dep.	2017-10-26 15:21:43 +01:00
FaceAnalyser.vcxproj	Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches.	2017-10-26 08:50:15 +01:00
FaceAnalyser.vcxproj.filters	Separating gaze analysis into a separate project, getting closer to being ready to integrate GUI and CE-CLM branches.	2017-10-26 08:50:15 +01:00