Commit Graph

5 Commits

Author SHA1 Message Date
Tadas Baltrusaitis 305af01326 Auto stash before merge of "develop" and "origin/develop"
- Adding new license files
- Replacing images with more suitable CC ones
2017-05-08 21:36:23 -04:00
Chris Watts c334bf0ac3 Use preprocessor defines rather than configured header files for CONFIG_DIR so it works when not using CMake 2016-12-29 23:36:10 +00:00
Chris Watts b33fe0730a Fix the make install process on Unix
Conflicts:
	.gitignore
2016-12-18 00:10:43 +00:00
Tadas Baltrusaitis c1ff40399e Bug fixes 2016-09-06 12:32:33 -04:00
unknown 57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00