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

Conflicts:
	metadata/a2dp.Vol.txt
	metadata/org.lumicall.android.txt
This commit is contained in:
David Black 2013-01-21 18:53:13 +00:00
commit e60aa2431e
6 changed files with 9 additions and 4 deletions

View file

@ -43,6 +43,9 @@ update=.;ViewPagerIndicator/library;ActionBarSherlock/library
Build Version:5.6,36,5.6,submodules=yes,\
update=.;ViewPagerIndicator/library;ActionBarSherlock/library;Riasel/library;drag-sort-listview,prebuild=\
sed -i '/proguard/d' project.properties
Build Version:5.8,38,5.8,submodules=yes,\
update=.;ViewPagerIndicator/library;ActionBarSherlock/library;Riasel/library;drag-sort-listview,prebuild=\
sed -i '/proguard/d' project.properties
Auto Update Mode:None
Update Check Mode:Tags

View file

@ -26,6 +26,7 @@ Build Version:1.1,25,v1.1,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*
Build Version:1.1.1,26,4c7df5bb54,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties,forcevercode=yes
Build Version:1.1.3,29,d4533d9533,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
Build Version:2.0,30,4e4bafed59,prebuild=sed -i -e "/key\.alias.*/d" -e "/key\.store.*/d" *.properties
Build Version:2.0,31,!Different version code - same version?
Auto Update Mode:None
Update Check Mode:Market

View file

@ -32,8 +32,8 @@ See the source code page for more detailed instructions and an FAQ.
Repo Type:git
Repo:https://github.com/jberkel/sms-backup-plus.git
Build Version:1.4.3,1404,1.4.3
Build Version:1.4.4,1405,1.4.4,target=android-10,prebuild=mv lib libs
Build Version:1.4.3,1404,!non-free paypal jar at 1.4.3
Build Version:1.4.4,1405,!non-free paypal jar at 1.4.4,target=android-10,prebuild=mv lib libs
Build Version:1.4.6,1407,!paypal jar,target=android-10,prebuild=mv lib libs
Build Version:1.4.8,1409,1.4.8,srclibs=K9Mail-XOAUTH@70c41c71cd,prebuild=\
mv $$K9Mail-XOAUTH$$/compile-only-libs $$K9Mail-XOAUTH$$/libs && \

View file

@ -15,7 +15,7 @@ Repo Type:svn
Repo:http://worktime.googlecode.com/svn/branches
Build Version:1.1.2.f,104,268,target=android-11,patch=style.patch,subdir=1.1.2/android-app
Build Version:1.1.3.a - UNSTABLE,107,273,target=android-11,patch=style.patch,subdir=1.1.3/android-app
Build Version:1.1.3.a - UNSTABLE,107,!no such subdir at 273,target=android-11,patch=style.patch,subdir=1.1.3/android-app
Build Version:1.1.9,201,!ormlite errors at 686,subdir=1.1.9/android-app
Auto Update Mode:None

View file

@ -13,7 +13,7 @@ Repo Type:svn
Repo:https://learnmusicnotes.svn.sourceforge.net/svnroot/learnmusicnotes/trunk
Build Version:1.2,3,16
Build Version:1.4,5,20,forcversion=yes,forcevercode=yes
Build Version:1.4,5,!No source published
Update Check Mode:Market
Current Version:1.4

View file

@ -20,6 +20,7 @@ Build Version:1.0.1,3,d29570f185d585d3eaf83ebf8b9e78928f36ad2e,extlibs=guice/gui
Build Version:1.1.2,6,1.1.2,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.1-SNAPSHOT.jar;htmlcleaner/htmlcleaner-2.2.jar
Build Version:1.2.1,8,d7a087618ba4390d8f154da656cc26ad92d2354c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
Build Version:1.3.4,14,6d28de0b2c,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
Build Version:2.0.5,22,!strange request for credentials during build at 2.0.5,srclibs=ActionBarNW@1a98f283,extlibs=guice/guice-2.0-no_aop.jar;roboguice/roboguice-1.1.jar;epublib/epublib-core-3.0-SNAPSHOT2.jar;acra/acra-4.2.3.jar;sl4j/slf4j-android-1.6.1-RC1.jar;HtmlSpanner/htmlspanner-0.2.jar;htmlcleaner/htmlcleaner-2.2.jar,prebuild=sed -i 's@\(android\.library\.reference\.1=\).*@\1$$ActionBarNW$$@' project.properties,target=android-15
Auto Update Mode:None
Update Check Mode:Tags