Commit graph

14 commits

Author SHA1 Message Date
David Black aad5d6c017 Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
Conflicts:
	metadata/android.game.prboom.txt
	metadata/com.fsck.k9.txt
	metadata/com.showmehills.txt
	metadata/jp.sblo.pandora.jota.txt
2012-08-23 14:11:23 +01:00
David Black a0f71d0747 merge 2012-08-23 11:57:13 +01:00
David Black ce937c186f Merge branch 'master' of git://gitorious.org/f-droid/fdroiddata
Conflicts:
	metadata/android.game.prboom.txt
	metadata/com.android.keepass.txt
	metadata/com.axelby.podax.txt
	metadata/com.bwx.bequick.txt
	metadata/com.fsck.k9.txt
	metadata/com.owncloud.android.txt
	metadata/com.showmehills.txt
	metadata/com.zoffcc.applications.zanavi.txt
	metadata/de.schildbach.wallet_test.txt
	metadata/jp.sblo.pandora.jota.txt
	metadata/me.guillaumin.android.osmtracker.txt
	metadata/org.eehouse.android.xw4.txt
	metadata/org.mozilla.firefox_beta.txt
	metadata/org.wahtod.wififixer.txt
	metadata/org.wordpress.android.txt
2012-08-23 11:17:50 +01:00
Ciaran Gultnieks a2cad31554 Merge commit 'refs/merge-requests/55' of git://gitorious.org/f-droid/fdroiddata into merge-requests/55
Conflicts:
	metadata/android.game.prboom.txt
	metadata/com.android.keepass.txt
	metadata/com.axelby.podax.txt
	metadata/com.bwx.bequick.txt
	metadata/com.fsck.k9.txt
	metadata/com.owncloud.android.txt
	metadata/com.showmehills.txt
	metadata/com.zoffcc.applications.zanavi.txt
	metadata/de.schildbach.wallet_test.txt
	metadata/jp.sblo.pandora.jota.txt
	metadata/me.guillaumin.android.osmtracker.txt
	metadata/org.eehouse.android.xw4.txt
	metadata/org.mozilla.firefox_beta.txt
	metadata/org.thoughtcrime.securesms.txt
	metadata/org.wahtod.wififixer.txt
	metadata/org.wordpress.android.txt
2012-08-23 09:56:56 +01:00
Ciaran Gultnieks bbc8e8a18c Current version updates 2012-08-22 15:08:53 +01:00
David Black 5b69f46a45 fix show me hills 2012-08-08 13:59:54 +01:00
David Black c6705249f9 Merge branch 'master' of gitorious.org:f-droid/fdroiddata 2012-08-08 13:41:31 +01:00
David Black 3fbd74e728 Merge branch 'master' of gitorious.org:f-droid/fdroiddata
Conflicts:
	metadata/com.showmehills.txt
2012-08-08 13:41:11 +01:00
Ciaran Gultnieks 2ae51a08a5 ShowMeHills needs NonFreeDep antifeature 2012-08-08 13:37:26 +01:00
Ciaran Gultnieks 073eda65d0 Updated showmehills to 0.16 2012-08-08 13:36:26 +01:00
David Black 573565574c I ran checkupdates and I tried to add new build versions for the low
hanging fruit. There may be a few other small changes such as to a
Firefox Beta comment.
Also changes to Osmand/OSmand+ description and donation got included by
mistake
2012-08-08 13:31:42 +01:00
Ciaran Gultnieks 35e4c00ac4 Updated showmehills to 0.4 2012-05-29 08:53:02 +01:00
Ciaran Gultnieks 06be55f855 Showmehills corrections 2012-05-29 08:50:34 +01:00
Nik Cain 9945766f77 Added showmehills 2012-05-29 08:48:36 +01:00