Commit graph

10 commits

Author SHA1 Message Date
Abdelrahman Mahmoud
0ffd40f18a Fix location of highgui header 2016-06-06 00:04:08 -04:00
Abdelrahman Mahmoud
23fff5902b Merge branch 'linux-3.0' of https://github.com/Affectiva/win-sdk-samples into linux-3.0 2016-04-08 10:13:45 -04:00
Abdelrahman Mahmoud
7c66b5e7af Remove the word Windows from the man pages 2016-04-08 10:12:02 -04:00
abdelrahman
4061763086 iFix bug in video-demo 2016-04-05 14:30:11 -04:00
abdelrahman
9af6fcd9c2 Fix a bug where the screen hangs in the case of photo/video 2016-04-05 13:58:40 -04:00
Abdelrahman Mahmoud
549e446f21 Add to video-demo the ability to process photos as well as images 2016-04-05 11:25:50 -04:00
Abdelrahman Mahmoud
0d8c63f959 Add emojis to the output file 2016-04-05 11:24:54 -04:00
Abdelrahman Mahmoud
cdeb071732 Add CMakeLists files to generate and compile the sample applications on Ubuntu 14.04 2016-03-18 14:28:55 -04:00
Abdelrahman Mahmoud
aff6fc8c10 copy data folder to release directory 2016-02-22 15:23:18 -05:00
Abdelrahman Mahmoud
0d39ef4964 Squashed commit of the following:
commit 45c5b72d6c294fe1a4cd90f8090442d313886fc9
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Wed Feb 3 07:17:09 2016 -0500

    Remove affdex me .. fix dll references

commit 98bfdbc3302c1ba8226a4151826c541d8d250aa9
Author: Abdelrahman Mahmoud <ahamino@gmail.com>
Date:   Wed Feb 3 06:57:59 2016 -0500

    Update README.md

commit fd9dedbdc7daeeacc65ef1df8b79447e5e22cc64
Author: Abdelrahman Mahmoud <ahamino@gmail.com>
Date:   Tue Feb 2 15:43:00 2016 -0500

    Update README.md

    update appveyor badge

commit ccbd9770da316c35de75b47d749e14bd551acc2a
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:36:11 2016 -0500

    Update appveyor badge

commit b08547f1dd77548f24140e709a8574d23c8aa7db
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:32:03 2016 -0500

    Add appveyor badge

commit e0a2b36ca9fb0c828bf54c7326aa59a1fa6d1079
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:11:50 2016 -0500

    remove nuget references

commit b5561f7353381106ad5b133d3bc73d49d36bcbc0
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 15:01:15 2016 -0500

    remove nuget

commit ec3d93bb38e5390f176de23dd249b30e5420f3fb
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 14:09:28 2016 -0500

    More changes to get nuget working

commit ea9662b583d08fa9bae3b30cb2d909d288911b2e
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:53:20 2016 -0500

    Change the opencv version

commit 56ffaebfb3c3cdc1610f1ad2c67a47010d0e3dbf
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:29:22 2016 -0500

    Commit changes to the nuget configuration

commit 3e6aa2c2dc4a8cb97dd9999154b8c6fb5471c351
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Tue Feb 2 12:12:03 2016 -0500

    add nuget configuration

commit e69ea5e078b42a286f0ca27b09b922178e376cd1
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Feb 1 17:02:38 2016 -0500

    Remove unecessary packages from nuget

commit 3f98b04af745b880be3f4be5d4e7d7a6174f2453
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Dec 21 18:22:45 2015 -0500

    Update the documentation

commit a92352bea891e553fb8f8da61afda3fa255ec46f
Author: Abdelrahman Mahmoud <mahmoud@affectiva.com>
Date:   Mon Dec 21 17:54:55 2015 -0500

    Add video demo 2.1
2016-02-03 07:20:08 -05:00