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

Conflicts:
	metadata/org.fdroid.fdroid.txt
This commit is contained in:
David Black 2012-08-26 12:01:54 +01:00
commit 335393c578
6 changed files with 13 additions and 12 deletions

View file

@ -18,7 +18,7 @@ Repo:https://code.google.com/p/asqare/
Build Version:1.3,103,61828d08,subdir=asqare
Update Check Mode:Market
Current Version:1.2
Current Version Code:102
Update Check Mode:None
Current Version:1.3
Current Version Code:103

View file

@ -20,7 +20,8 @@ Build Version:1.09.05,10905,fc40dccbb9,subdir=Timeriffic,oldsdkloc=yes,novcheck=
#note the source tree re-org, which means some of the settings above need
#to change, and also the switch to android-11 as a target.
Build Version:1.09.11,10911,!Can't find correct commit. See metadata notes too.
Build Version:1.09.12,10912,!No source for this in the repo
Build Version:1.09.12,10912,!Source code is not published
Build Version:1.10.01,11001,!Source code is not published
Update Check Mode:Market
Current Version:1.10.01

View file

@ -23,10 +23,8 @@ Build Version:1.9.5,82,v1.9.5
Build Version:1.9.6,83,v1.9.6
Build Version:1.9.7,84,v1.9.7,target=android-8
Build Version:1.9.8,85,v1.9.8,target=android-8
#Temporarily disabled - need MIPS version of NDK I think
#Build Version:1.9.9,86,v1.9.9,target=android-8,buildjni=yes
#Build Version:1.9.14,91,v1.9.14,target=android-8,buildjni=yes
Build Version:1.9.9,86,!needs MIPS NDK to build (tag v1.9.9),target=android-8,buildjni=yes
Build Version:1.9.14,91,!needs MIPS NDK to build (tag v1.9.14),target=android-8,buildjni=yes
Update Check Mode:Market
Current Version:1.9.14

View file

@ -16,6 +16,7 @@ Repo Type:git
Repo:https://github.com/romanbb/AOKP_Backup.git
Build Version:1.51,22,531698
Build Version:1.54,25,!Incomplete source (com.parse?) (02763131d3c61),extlibs=commons-io/commons-io-2.4.jar
Update Check Mode:RepoManifest
Current Version:1.54

View file

@ -1,4 +1,4 @@
Category:Multumedia
Category:Multimedia
License:GPLv3
Web Site:http://code.google.com/p/colorpicker
Source Code:http://code.google.com/p/colorpicker/source/checkout

View file

@ -28,9 +28,10 @@ Build Version:0.22,13,a6a33c942495cc4c74a7cb6e968efe0e00815e68,update=force
Build Version:0.23,14,aa58a8aad1a1c3832eafb9f1bdd6db8292d2c172,update=force
Build Version:0.24,15,9b5fe2976443255b95027abd412f1c1e7f3d27b2,update=force
Build Version:0.25,16,43977cc493e47a4dc841c4192ae8a40fb14b639b,update=force
Build Version:0.26,17,b5604d3,target=android-15,target=android-15
Build Version:0.26,17,b5604d3bda63a86d191667e8d9e8552ab243433a,target=android-15
Build Version:0.27,18,86a68d8ed2209b3a526ee54bb4060dc7a31207ed,target=android-15
Update Check Mode:RepoManifest
Current Version:0.25
Current Version Code:16
Current Version:0.27
Current Version Code:18