Merge branch 'master' of 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

metadata/android.game.prboom.txt

@@ -25,7 +25,8 @@ Repo:http://prboom4android.googlecode.com/svn/trunk/
 
 Build Version:1.3.1-beta,31,49,buildjni=yes
 
-#not in market
+#Not in market
 Update Check Mode:None
+
 Current Version:1.3.1-beta
 Current Version Code:31

metadata/com.fsck.k9.txt

@@ -6,19 +6,15 @@ Issue Tracker:http://code.google.com/p/k9mail/issues/list
 
 Summary:Full-featured email client
 Description:
-N.B if you are installing the newer version that is built from source, you must uninstall the one you have as it's signed with a different key. Not to worry though as K9mail is able to export all your settings; you only need to re-enter your passwords after you import them into the new version.
-
 Email client supporting multiple accounts, POP3, IMAP, Push IMAP. Packed with
 features and highly configurable.
-
-If you want to contribute financially, please make a donation to the local SPCA
 .
 
 Repo Type:git
 Repo:https://github.com/k9mail/k-9.git
 
+#Note - k9 is currently developer's binary only
 #Build Version:3.906,14006,3.906,oldsdkloc=yes,patch=target9to10.patch,target=android-10
-Build Version:4.301,17001,5b4d2806
 
 Update Check Mode:Market
 Current Version:4.011

metadata/com.kirit.android.mintercept.txt

@@ -10,14 +10,7 @@ A game in the style of the classic Missile Command. Defend your cities from inco
 enemy missiles.
 .
 
-Repo Type:git-svn
+Update Check Mode:Market
-Repo:http://svn.felspar.com/public/m-intercept/trunk/android
-
-#strange revision number
-#Build Version:0.5.1,6,44345
-
-#not in the market
-Update Check Mode:None
 Current Version:0.5.1
 Current Version Code:6
 

metadata/com.showmehills.txt

@@ -24,6 +24,7 @@ echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
 
 #Note that 0.17 will either need acra.disabled patching to be true by default, or
 #the appropriate AntiFeature flag adding.
+
 Update Check Mode:Market
 Current Version:0.20
 Current Version Code:20

metadata/com.zegoggles.gist.txt

@@ -1,4 +1,3 @@
-Disabled:Written in Scala
 Category:Internet
 License:MIT
 Web Site:https://github.com/jberkel/gist-it#readme

metadata/com.zoffcc.applications.zanavi.txt

@@ -28,5 +28,3 @@ Update Check Mode:Market
 Current Version:2.0.0
 Current Version Code:200
 
-#......
-#Build Version:1.0.52

metadata/jp.sblo.pandora.jota.txt

@@ -21,4 +21,3 @@ Build Version:0.2.13,63,113,buildjni=yes,target=android-11
 Update Check Mode:Market
 Current Version:0.2.26
 Current Version Code:76
-

metadata/org.mustard.android.txt

@@ -12,12 +12,6 @@ Mustard is the first full-featured statusnet (like identica) client application
 It has many features like attachments, geolocation and avatar update. It supports tags, groups and public timelines, favor/disfavor notices, subscribe/unsubscribe users and multiple accounts.
 .
 
-Repo Type:git
-Repo:git://gitorious.org/~macno/mustard/macnos-clone.git
-
-#compile errors
-#Build Version:0.3.4beta2,136,25548f6e1d1047be8c5f5bae9dbc237da678b637
-
 Update Check Mode:Market
 Current Version:0.3.3
 Current Version Code:134

metadata/org.piwik.mobile.txt

@@ -10,8 +10,6 @@ Piwik is an open-source web analytics package. Piwik Mobile is a client that giv
 you access to your statistics.
 .
 
-Build Version:1.8.0,13,!Titanium
-
 Update Check Mode:Market
 Current Version:1.8.0
 Current Version Code:13

metadata/org.swiftp.txt

@@ -14,8 +14,7 @@ device, optionally, if you have root access).
 Repo Type:svn
 Repo:http://swiftp.googlecode.com/svn/trunk/
 
-#development pause
+Update Check Mode:Market
-Update Check Mode:None
 Current Version:1.24
 Current Version Code:17
 

metadata/org.thoughtcrime.securesms.txt

@@ -17,8 +17,9 @@ Repo Type:git
 Repo:https://github.com/WhisperSystems/TextSecure.git
 
 Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-10
-#needs work
+Build Version:0.6.1,23,v0.6.1,target=android-14,srclibs=ActionBarSherlock@4.0.2,\
-#Build Version:0.6.1,23,39008085785085a85beac14daea
+prebuild=android update project -p . -l $$ActionBarSherlock$$
+Build Version:0.6.2,24,!No source code published
 
 Update Check Mode:Market
 Current Version:0.6.2

metadata/paulscode.android.mupen64plus.txt

@@ -0,0 +1,10 @@
+Category:Games
+License:GPL
+Web Site:http://www.paulscode.com/forum/index.php?topic=96
+Source Code:http://www.paulscode.com/forum/index.php?topic=96
+Issue Tracker:
+Summary:Nintendo 64 Emulator
+Description:
+N64 emulator.
+.
+

metadata/sk.baka.aedict.txt

@@ -4,6 +4,7 @@ Web Site:https://code.google.com/p/aedict
 Source Code:https://code.google.com/p/aedict/source/list
 Issue Tracker:https://code.google.com/p/aedict/issues/list
 Donate:https://code.google.com/p/aedict/
+Bitcoin:1KJyEutxrm3yL7chvsciMJTvXahXoWE3Pw
 
 Summary:English-Japanese dictionary
 Description:

stats/known_apks.txt

@@ -128,6 +128,7 @@ android.androidVNC_13.apk android.androidVNC 2011-04-06
 android.game.prboom_31.apk android.game.prboom 2012-03-10
 android.tether_26.apk android.tether 2012-07-26
 androidVNC_build20100725.apk android.androidVNC 2010-11-18
+apps.babycaretimer_6.apk apps.babycaretimer 2012-08-23
 apps.droidnotify_27.apk apps.droidnotify 2012-01-21
 apps.droidnotify_29.apk apps.droidnotify 2012-01-28
 apps.droidnotify_30.apk apps.droidnotify 2012-02-02
@@ -206,6 +207,7 @@ com.danga.squeezer_5.apk com.danga.squeezer 2011-03-02
 com.digitallizard.nicecompass_6.apk com.digitallizard.nicecompass 2012-01-28
 com.dozingcatsoftware.bouncy_10.apk com.dozingcatsoftware.bouncy 2011-08-04
 com.dozingcatsoftware.bouncy_4.apk com.dozingcatsoftware.bouncy 2011-03-10
+com.dozingcatsoftware.dodge_8.apk com.dozingcatsoftware.dodge 2012-08-23
 com.dririan.RingyDingyDingy_5.apk com.dririan.RingyDingyDingy 2012-08-10
 com.dririan.RingyDingyDingy_600.apk com.dririan.RingyDingyDingy 2012-08-10
 com.dririan.RingyDingyDingy_700.apk com.dririan.RingyDingyDingy 2012-08-10
@@ -290,6 +292,7 @@ com.ichi2.anki_29.apk com.ichi2.anki 2012-06-27
 com.ihunda.android.binauralbeat_24.apk com.ihunda.android.binauralbeat 2012-02-11
 com.jadn.cc_129.apk com.jadn.cc 2012-01-07
 com.jotabout.screeninfo.Screeninfo_103.apk com.jotabout.screeninfo 2012-07-05
+com.kibab.android.EncPassChanger_1.apk com.kibab.android.EncPassChanger 2012-08-23
 com.kmagic.solitaire_450.apk com.kmagic.solitaire 2011-01-23
 com.kostmo.wallpaper.spiral_12.apk com.kostmo.wallpaper.spiral 2012-03-23
 com.leinardi.kitchentimer_116.apk com.leinardi.kitchentimer 2012-01-28
@@ -416,6 +419,7 @@ dk.andsen.asqlitemanager_10.apk dk.andsen.asqlitemanager 2012-01-26
 dk.andsen.asqlitemanager_11.apk dk.andsen.asqlitemanager 2012-04-18
 dk.andsen.asqlitemanager_12.apk dk.andsen.asqlitemanager 2012-06-14
 dk.andsen.asqlitemanager_13.apk dk.andsen.asqlitemanager 2012-08-09
+dk.andsen.asqlitemanager_14.apk dk.andsen.asqlitemanager 2012-08-23
 dk.andsen.asqlitemanager_7.apk dk.andsen.asqlitemanager 2011-12-05
 dk.andsen.asqlitemanager_9.apk dk.andsen.asqlitemanager 2011-12-08
 edu.killerud.kitchentimer_3.apk edu.killerud.kitchentimer 2012-04-03
@@ -501,6 +505,8 @@ linphone-android-1.3.2.apk org.linphone 2012-07-21
 me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07-03
 me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10-02
 me.guillaumin.android.osmtracker_22.apk me.guillaumin.android.osmtracker 2012-02-05
+me.guillaumin.android.osmtracker_23.apk me.guillaumin.android.osmtracker 2012-08-23
+me.guillaumin.android.osmtracker_26.apk me.guillaumin.android.osmtracker 2012-08-23
 mixare-0061.apk org.mixare
 mixare-0062.apk org.mixare
 mixare-0063.apk org.mixare
@@ -887,6 +893,7 @@ se.johanhil.duckduckgo_1.apk se.johanhil.duckduckgo 2011-03-10
 se.peterbjorkman.android.trafikinfo_12.apk se.peterbjorkman.android.trafikinfo 2011-01-27
 se.peterbjorkman.android.trafikinfo_13.apk se.peterbjorkman.android.trafikinfo 2011-02-02
 se.sandos.android.delayed_18.apk se.sandos.android.delayed 2012-07-26
+sk.madzik.android.logcatudp_5.apk sk.madzik.android.logcatudp 2012-08-23
 sms-backup-plus-v1.2.apk com.zegoggles.smssync 2010-11-19
 sms-backup-plus-v1.3.2.apk com.zegoggles.smssync
 sms-backup-plus-v1.3.3.apk com.zegoggles.smssync
@@ -904,6 +911,7 @@ transdroid-0.22.3.apk org.transdroid
 transdroid-1.0.4.apk org.transdroid 2011-05-24
 transdroid-1.1.0-beta.apk org.transdroid 2011-10-21
 transdroid-1.1.4.apk org.transdroid 2012-08-21
+tritop.android.androsens_2.apk tritop.android.androsens 2012-08-23
 tuioDroid.impl_4.apk tuioDroid.impl 2011-11-28
 tuxrider_1.0.4.apk com.drodin.tuxrider 2010-11-18
 uk.ac.cam.cl.dtg.android.barcodebox_3.apk uk.ac.cam.cl.dtg.android.barcodebox 2012-08-13