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
..
FaceLandmarkImg	Merge branch 'develop' into feature/Windows-GUI	2017-10-26 17:42:43 +01:00
FaceLandmarkVid	Merge branch 'develop' into feature/Windows-GUI	2017-10-26 17:42:43 +01:00
FaceLandmarkVidMulti	Merge branch 'develop' into feature/Windows-GUI	2017-10-26 08:06:18 +01:00
FeatureExtraction	Merge branch 'develop' into feature/Windows-GUI	2017-10-26 17:42:43 +01:00
Recording	Merge branch 'master' into feature/Windows-GUI	2017-05-15 13:19:11 -04:00