r/weknowhowyoufeel
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
weknowhowyoufeel/AffdexMe
History
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
..
.idea Add the new affdexme 2015-09-10 13:30:10 -04:00
app Merge branch 'master' into two_oh_one 2015-10-01 21:12:00 -04:00
gradle/wrapper -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
.gitignore -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
AffdexMe.iml Updated AffdexMe to contain public-facing resource files 2015-08-28 15:22:46 -04:00
AffdexMe_original.iml -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
build.gradle -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
gradle.properties -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
gradlew Make gradlew excutable 2015-09-11 21:24:42 +02:00
gradlew.bat -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00
settings.gradle -upload AffdexMe folder to GitHub 2015-06-23 16:44:24 -04:00