sustaining_gazes/lib
Tadas Baltrusaitis 038ce5823d Merge branch 'develop' into feature/Windows-GUI
# Conflicts:
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	lib/local/GazeAnalyser/src/GazeEstimation.cpp
#	lib/local/LandmarkDetector/include/LandmarkDetectorFunc.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorFunc.cpp
2017-10-25 17:21:47 +01:00
..
3rdParty Merge branch 'develop' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI 2017-10-24 08:29:32 +01:00
local Merge branch 'develop' into feature/Windows-GUI 2017-10-25 17:21:47 +01:00