1
0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00

Merge branch 'develop' into release-1.5.4

This commit is contained in:
David A. Velasco 2014-02-14 14:53:22 +01:00
commit a0fdb521cf

View File

@ -4,21 +4,21 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.owncloud.android</groupId>
<artifactId>oc_framework</artifactId>
<artifactId>owncloud-android-library</artifactId>
<version>${owncloud.version}</version>
<packaging>jar</packaging>
<name>oc_framework for Owncloud Android</name>
<name>owncloud-android-library for Owncloud Android</name>
<properties>
<owncloud.version>1.5.1-SNAPSHOT</owncloud.version>
<java-version>1.6</java-version>
<!-- Given by maven-android-sdk-deployer -->
<google.android-version>4.4_r1</google.android-version>
<google.android-version>4.4.2_r2</google.android-version>
<!-- Usually the latest Android API -->
<google.android-api>19</google.android-api>
</properties>
<description>oc_framwork for Owncloud for Android</description>
<description>owncloud-android-library for Owncloud for Android</description>
<dependencies>