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
..
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-26 17:42:43 +01:00