Tadas Baltrusaitis b224fcdfc9 Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace into feature/Windows-GUI ...

# Conflicts:
#	.gitignore
#	exe/FaceLandmarkVidMulti/FaceLandmarkVidMulti.cpp
#	lib/local/FaceAnalyser/FaceAnalyser.vcxproj
#	lib/local/LandmarkDetector/include/LandmarkDetectorUtils.h
#	lib/local/LandmarkDetector/src/LandmarkDetectorUtils.cpp
#	matlab_runners/Demos/feature_extraction_demo_vid.m
#	matlab_runners/Demos/gaze_extraction_demo_vid.m

2017-12-29 16:27:00 +00:00

..

CMakeLists.txt

Adapting Cmake to new interface.

2017-12-13 17:50:48 +00:00

FeatureExtraction.cpp

Correct metafile output for webcam.

2017-12-12 17:48:46 +00:00

FeatureExtraction.vcxproj

Adding images for new wiki entries and some code for packaging releases.

2017-12-28 19:47:49 +00:00

FeatureExtraction.vcxproj.user

Big restructure of the code, moving closer to a new version with a GUI:

2017-05-18 17:04:38 -04:00