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

Conflicts:
	metadata/com.fsck.k9.txt
	stats/known_apks.txt
This commit is contained in:
David Black 2012-08-24 14:28:59 +01:00
commit 78f709132a
4 changed files with 31 additions and 0 deletions

View file

@ -27,5 +27,6 @@ Build Version:1.3.1-beta,31,49,buildjni=yes
#Not in market
Update Check Mode:None
Current Version:1.3.1-beta
Current Version Code:31

View file

@ -15,6 +15,7 @@ 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
Update Check Mode:Market
Current Version:4.011
Current Version Code:14029

View file

@ -0,0 +1,19 @@
Category:Office
License:Apache2
Web Site:http://www.joshyyy.com/smoke_reducer.html
Source Code:https://gitorious.org/smoke-reducer/smoke-reducer
Summary:Track your smoking habits
Description:
First of all Smoke reducer (and stopper) records the distance between two times you are smoking. Then, it lengthens that time between each cigarette by telling you when to smoke. If you click the Sleep button, the time that you sleep isn't counted to the time between each alarm
.
Repo Type:git
Repo:https://git.gitorious.org/smoke-reducer/smoke-reducer.git
Build Version:1.0,1,3f999b
Update Check Mode:RepoManifest
Current Version:1.0
Current Version Code:1

View file

@ -129,6 +129,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
@ -215,6 +216,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
@ -308,7 +310,11 @@ com.jakebasile.android.hearingsaver_12.apk com.jakebasile.android.hearingsaver 2
com.jecelyin.editor_32.apk com.jecelyin.editor 2012-08-23
com.jlyr_1.apk com.jlyr 2012-08-23
com.jotabout.screeninfo.Screeninfo_103.apk com.jotabout.screeninfo 2012-07-05
<<<<<<< HEAD
com.kkinder.sharelocation_141.apk com.kkinder.sharelocation 2012-08-23
=======
com.kibab.android.EncPassChanger_1.apk com.kibab.android.EncPassChanger 2012-08-23
>>>>>>> 10de0ecfdafb99b6abe752bf2c3efcbb7dfaab57
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.kostmo.wallpaper.spiral_13.apk com.kostmo.wallpaper.spiral 2012-08-23
@ -541,7 +547,11 @@ me.guillaumin.android.osmtracker_20.apk me.guillaumin.android.osmtracker 2011-07
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
<<<<<<< HEAD
me.kuehle.carreport_8.apk me.kuehle.carreport 2012-08-23
=======
me.guillaumin.android.osmtracker_26.apk me.guillaumin.android.osmtracker 2012-08-23
>>>>>>> 10de0ecfdafb99b6abe752bf2c3efcbb7dfaab57
mixare-0061.apk org.mixare
mixare-0062.apk org.mixare
mixare-0063.apk org.mixare