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
FaceLandmarkImg.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
FaceLandmarkImg.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
FaceLandmarkImg.vcxproj.user	Fixes to camera loading.	2016-10-04 21:14:41 -04:00