Commit graph

25 commits

Author SHA1 Message Date
Tadas Baltrusaitis
5d5947a41d Merge branch 'master' of https://github.com/TadasBaltrusaitis/OpenFace
Conflicts:
	.gitignore
2016-07-22 12:36:11 -04:00
Tadas Baltrusaitis
e4fac9eae2 Merge pull request #27 from simonmssu/master
specify TBB header file location
2016-07-21 09:02:54 -04:00
simonmssu
6513be147b Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:15:44 -04:00
simonmssu
409e2a89f3 Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:15:18 -04:00
simonmssu
73a28260ec Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:14:36 -04:00
simonmssu
f5ed435e18 Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:13:37 -04:00
simonmssu
d9d4b10a52 Update CMakeLists.txt
to specify the location of TBB header file
2016-07-11 16:12:34 -04:00
simonmssu
819e087c98 Update CMakeLists.txt 2016-07-11 16:11:02 -04:00
simonmssu
e56cd18f27 Merge pull request #1 from TadasBaltrusaitis/master
to sync with TadasBaltrusaitis version
2016-07-07 08:12:58 -04:00
Tadas Baltrusaitis
e0fa16ee04 Fixing eye landmark Matlab demo. 2016-06-13 20:48:06 -04:00
Tadas Baltrusaitis
4a73ece996 Changing project settings to allow for older CPUs without AVX2 instruction set. 2016-06-11 11:57:54 -04:00
Tadas Baltrusaitis
803575d5b7 More work at establishing AU baselines on SEMAINE and BP4D datasets. 2016-05-24 16:51:18 -04:00
Tadas Baltrusaitis
a103d6558a Replacing illegal values for AUs. 2016-05-19 11:59:06 -04:00
Tadas Baltrusaitis
fc27b5bbb6 Moving things around for clarity. 2016-05-19 11:51:32 -04:00
Tadas Baltrusaitis
668588500c Merge pull request #5 from chiragraman/develop
Supporting out-of-source builds
2016-05-18 13:59:35 -04:00
Chirag Raman
a75973c64c Merged branch feature/ubuntu_15_10_installation into develop 2016-05-16 11:59:47 -04:00
Chirag Raman
62d744fee1 Add 'build/' to .gitignore 2016-05-16 11:59:25 -04:00
Chirag Raman
2e4f2af0e3 Add 'build/' to gitignore 2016-05-13 17:01:27 -04:00
unknown
7eb6f264f4 Updated .gitignore file, small renaming fix for executable. 2016-04-28 18:15:39 -04:00
unknown
7067c7cc74 Adding a .gitignore 2016-04-28 15:56:18 -04:00
Tadas Baltrusaitis
c2ba64c8b2 Update README.md 2016-04-28 15:49:53 -04:00
Tadas Baltrusaitis
451874e8df Update README.md 2016-04-28 15:48:56 -04:00
unknown
57e58a6949 Master commit of OpenFace. 2016-04-28 15:40:36 -04:00
unknown
5346d303ab More sample images. 2016-04-28 13:00:12 -04:00
unknown
6109e27f40 Used in the wiki. 2016-04-28 12:07:52 -04:00