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

Conflicts:
	metadata/dentex.youtube.downloader.txt
This commit is contained in:
David Black 2013-05-07 20:29:04 +01:00
commit 4a7df802ed
8 changed files with 666 additions and 664 deletions

View file

@ -27,6 +27,6 @@ rm -rf tests libs/slider.jar && echo "android.library.reference.1=$$Slider$$" >>
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market
Current Version:v3.2 Current Version:v3.3
Current Version Code:43 Current Version Code:44

View file

@ -22,6 +22,6 @@ echo "android.library.reference.1=$$NoAnalytics$$" >> project.properties
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Market Update Check Mode:Market
Current Version:1.15 Current Version:1.16
Current Version Code:115 Current Version Code:116

View file

@ -58,6 +58,6 @@ cd ../ && mv subsonic-android sa && rm -rf subsonic-* repo && mv sa subsonic-and
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:Tags Update Check Mode:Tags
Current Version:3.8.5 Current Version:3.8.6
Current Version Code:43 Current Version Code:45

View file

@ -30,6 +30,7 @@ Build Version:0.3.e.21,21,03bdd75002cf040,init=rm -rf bin/ gen/
Build Version:0.3.f.22,22,665257030f60e82,init=rm -rf bin/ gen/ Build Version:0.3.f.22,22,665257030f60e82,init=rm -rf bin/ gen/
Build Version:0.3.g.23,23,091b33410f9b8bb,init=rm -rf bin/ gen/ Build Version:0.3.g.23,23,091b33410f9b8bb,init=rm -rf bin/ gen/
Build Version:0.3.h.24,24,28e696e2216f9f8e75b4,init=rm -rf bin/ gen/ Build Version:0.3.h.24,24,28e696e2216f9f8e75b4,init=rm -rf bin/ gen/
Build Version:0.3.i.25,25,6466312acd494ff438ed,init=rm -rf bin/ gen/
Auto Update Mode:None Auto Update Mode:None
Update Check Mode:RepoManifest Update Check Mode:RepoManifest

View file

@ -222,6 +222,7 @@ ch.blinkenlights.android.vanilla_914.apk ch.blinkenlights.android.vanilla 2012-1
ch.blinkenlights.android.vanilla_915.apk ch.blinkenlights.android.vanilla 2012-11-10 ch.blinkenlights.android.vanilla_915.apk ch.blinkenlights.android.vanilla 2012-11-10
ch.blinkenlights.android.vanilla_917.apk ch.blinkenlights.android.vanilla 2013-01-18 ch.blinkenlights.android.vanilla_917.apk ch.blinkenlights.android.vanilla 2013-01-18
ch.blinkenlights.android.vanilla_918.apk ch.blinkenlights.android.vanilla 2013-03-12 ch.blinkenlights.android.vanilla_918.apk ch.blinkenlights.android.vanilla 2013-03-12
ch.blinkenlights.android.vanilla_920.apk ch.blinkenlights.android.vanilla 2013-05-06
ch.blinkenlights.battery_1335983644.apk ch.blinkenlights.battery 2012-08-23 ch.blinkenlights.battery_1335983644.apk ch.blinkenlights.battery 2012-08-23
ch.fixme.cowsay_4.apk ch.fixme.cowsay 2012-10-10 ch.fixme.cowsay_4.apk ch.fixme.cowsay 2012-10-10
ch.rrelmy.android.batterymanager_3.apk ch.rrelmy.android.batterymanager 2012-08-29 ch.rrelmy.android.batterymanager_3.apk ch.rrelmy.android.batterymanager 2012-08-29

View file

@ -4,9 +4,9 @@ Artistic Licensev2 1
GPLv3+ 49 GPLv3+ 49
Unknown 4 Unknown 4
GPLv2 47 GPLv2 47
GPLv3 302 GPLv3 303
GPL/MPL 1 GPL/MPL 1
Apache2 183 Apache2 184
NYSLv0.9982 1 NYSLv0.9982 1
EPL 1 EPL 1
ISC 1 ISC 1
@ -14,7 +14,7 @@ Apache2 1
NetBSD 1 NetBSD 1
GPL/Artistic 1 GPL/Artistic 1
AGPL 3 AGPL 3
MIT 37 MIT 36
CCBYSA 1 CCBYSA 1
WTFPL 9 WTFPL 9
CCBYNCSA3 1 CCBYNCSA3 1

View file

@ -1,7 +1,7 @@
svn 69 svn 69
srclib 5 srclib 5
none 13 none 13
git 484 git 485
bzr 10 bzr 10
git-svn 126 git-svn 126
hg 60 hg 60

File diff suppressed because it is too large Load diff