nextcloud-android/tests
masensio 90428ec4c7 Merge remote-tracking branch 'origin/develop' into folderSizeInfo
Conflicts:
	.classpath
	tests/.classpath
2013-06-17 13:32:40 +02:00
..
.settings Update branch with develop branch 2013-06-06 17:22:25 +02:00
res junit for android app 2012-09-30 01:14:38 +02:00
src/com/owncloud/android/test Copyright note fixes 2013-04-17 12:26:13 +02:00
.classpath Merge remote-tracking branch 'origin/develop' into folderSizeInfo 2013-06-17 13:32:40 +02:00
.project junit for android app 2012-09-30 01:14:38 +02:00
AndroidManifest.xml let tests run on emulator 2.2 2012-09-30 14:01:36 +02:00
proguard-project.txt junit for android app 2012-09-30 01:14:38 +02:00
project.properties Update branch with develop branch 2013-06-06 17:22:25 +02:00