Merge branch 'master' of gitorious.org:f-droid/fdroiddata

Conflicts:
	metadata/com.teleca.jamendo.txt
This commit is contained in:
David Black 2012-11-20 20:17:04 +00:00
commit 6cb5af657c
2 changed files with 4 additions and 2 deletions

View file

@ -23,6 +23,7 @@ Build Version:1.0.4 [BETA],35,63dceec70d59132b6311289c62edd0acb795ab27,target=an
Build Version:1.0.5 [BETA],37,v1.0.5b,update=force Build Version:1.0.5 [BETA],37,v1.0.5b,update=force
Build Version:1.0.6-legacy,38,e6b0ad8221,update=force,forceversion=yes Build Version:1.0.6-legacy,38,e6b0ad8221,update=force,forceversion=yes
Auto Update Mode:None
#Device variable and version code is similar for both apks #Device variable and version code is similar for both apks
Update Check Mode:None Update Check Mode:None
Current Version:1.0.4 [BETA] Current Version:1.0.4 [BETA]

View file

@ -52,7 +52,8 @@ echo "android.library.reference.3=$$RootCommands$$" >> project.properties && \
cp android-libs/Donations/ant-templates/other/DonationsConfig.java \ cp android-libs/Donations/ant-templates/other/DonationsConfig.java \
android-libs/Donations/src/org/donations/,buildjni=no android-libs/Donations/src/org/donations/,buildjni=no
Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market
Current Version:1.37 Current Version:2.0
Current Version Code:38 Current Version Code:39