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

Conflicts:
	metadata/de.schildbach.wallet.txt
This commit is contained in:
David Black 2013-04-03 13:08:28 +01:00
commit ea76947830
4 changed files with 631 additions and 631 deletions

View file

@ -22,6 +22,6 @@ Build Version:2.16.1,150,!no source yet as of 17-03-2013
Auto Update Mode:None
Update Check Mode:Market
Current Version:2.18.1.1
Current Version Code:157
Current Version:2.18.2
Current Version Code:158

View file

@ -6,7 +6,7 @@ Unknown 4
GPLv2 64
GPLv3 296
GPL/MPL 1
Apache2 171
Apache2 172
NYSLv0.9982 1
EPL 1
Apache2 1

View file

@ -1,4 +1,4 @@
svn 75
svn 76
srclib 5
none 13
git 460

File diff suppressed because it is too large Load diff