Commit graph

6 commits

Author SHA1 Message Date
Tadas Baltrusaitis
51f442a3e2 Merge pull request #107 from CJxD/develop
Fix CMake install process for Unix make install
2017-01-03 14:20:34 -05: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
Tadas Baltrusaitis
45fe3a611b Another small travis change. 2016-12-19 15:58:46 -05:00
Tadas Baltrusaitis
b9e6f53141 More travis fix attempts. 2016-12-19 14:59:25 -05:00
Chris Watts
b33fe0730a Fix the make install process on Unix
Conflicts:
	.gitignore
2016-12-18 00:10:43 +00:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00