Abdelrahman Mahmoud 11408d5a70 Merge branch 'master' into two_oh_one ... Conflicts: AffdexMe/app/src/main/java/com/affectiva/affdexme/DrawingView.java AffdexMe/app/src/main/java/com/affectiva/affdexme/MainActivity.java AffdexMe/app/src/main/res/drawable/camera_button_selector.xml AffdexMe/app/src/main/res/drawable/settings_button_selector.xml		2015-10-01 21:12:00 -04:00
..
src/main	Merge branch 'master' into two_oh_one	2015-10-01 21:12:00 -04:00
.gitignore	-upload AffdexMe folder to GitHub	2015-06-23 16:44:24 -04:00
app.iml	Add the new affdexme	2015-09-10 13:30:10 -04:00
build.gradle	Change application version number	2015-09-11 21:02:09 +02:00
build.xml	-upload AffdexMe folder to GitHub	2015-06-23 16:44:24 -04:00
proguard-rules.pro	Revert "Modified AffdexMe to use new 2.0 SDK"	2015-08-27 13:14:40 -04:00