Marcello Steiner ef768b7d1b Merge branch 'develop' of github.com:owncloud/android-library into buildsystem/gradle_develop ...

Conflicts:
	.travis.yml

2014-11-21 13:22:46 +01:00

..

.settings

Update org.eclipse.jdt.core.prefs settings for test_client

2014-04-29 10:42:30 +02:00

res

Move build_number resource to the right context

2014-11-12 19:14:07 +01:00

src/com/owncloud/android/lib/test_project/test

Let the setup() - testXXX() - tearDown() flow normally

2014-11-17 12:34:17 +01:00

.classpath

Updated layout of test projects

2014-04-08 13:29:27 +02:00

.project

Updated layout of test projects

2014-04-08 13:29:27 +02:00

AndroidManifest.xml

Updated layout of test projects

2014-04-08 13:29:27 +02:00

ant.properties

Updated layout of test projects

2014-04-08 13:29:27 +02:00

build.gradle

Added gradle support to the owncloud-android-library

2014-11-21 13:20:05 +01:00

build.xml

Updated layout of test projects

2014-04-08 13:29:27 +02:00

custom_rules.xml

Move build_number resource to the right context

2014-11-12 19:14:07 +01:00

project.properties

Updated layout of test projects

2014-04-08 13:29:27 +02:00