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

..

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

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

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

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