Commit graph

4 commits

Author SHA1 Message Date
David Black 89173057fb nothing to see here 2012-08-10 15:03:06 +01:00
David Black 4712305269 Merge branch 'master' of gitorious.org:f-droid/fdroiddata
Conflicts:
	metadata/apps.droidnotify.txt
	metadata/csh.cryptonite.txt
	metadata/de.kugihan.dictionaryformids.hmi_android.txt
	metadata/jp.co.kayo.android.localplayer.ds.ampache.txt
	metadata/org.yaaic.txt
2012-08-10 14:29:30 +01:00
Ciaran Gultnieks e6204bb9b9 Corrections for merge request 52 2012-08-10 09:52:02 +01:00
David Black 994cc51891 Three new apps: Just-Player and associated plugins 2012-08-02 11:27:56 +01:00