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

..

CMakeLists.txt

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

FeatureExtraction.cpp

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

FeatureExtraction.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

FeatureExtraction.vcxproj.user

Big restructure of the code, moving closer to a new version with a GUI:

2017-05-18 17:04:38 -04:00