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

Conflicts:
	stats/known_apks.txt
This commit is contained in:
David Black 2012-08-24 14:31:07 +01:00
commit e9f58db685
2 changed files with 8 additions and 27 deletions

View file

@ -1,27 +0,0 @@
Category:Phone & SMS
License:GPLv3
Web Site:http://www.whispersys.com/
Source Code:https://github.com/WhisperSystems/TextSecure
Issue Tracker:
Summary:SMS Encryption
Description:
TextSecure is a drop-in replacement for the standard text messaging application,
allowing you to send and receive text messages as normal. All text messages
sent or received with TextSecure are stored in an encrypted database on your
phone, and text messages are encrypted during transmission when communicating
with someone else also using TextSecure.
.
Repo Type:git
Repo:https://github.com/WhisperSystems/TextSecure.git
Build Version:0.5.7,21,6a30867fd481474e8634b508d524863bc8a6b565,target=android-10
Build Version:0.6.1,23,v0.6.1,target=android-14,srclibs=ActionBarSherlock@4.0.2,\
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
Current Version Code:24

View file

@ -311,10 +311,14 @@ 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
<<<<<<< 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.kkinder.sharelocation_141.apk com.kkinder.sharelocation 2012-08-23
>>>>>>> abf4fd70155c2d870e029171d4714a16586f4624
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
@ -548,10 +552,14 @@ me.guillaumin.android.osmtracker_21.apk me.guillaumin.android.osmtracker 2011-10
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
<<<<<<< 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
=======
me.kuehle.carreport_8.apk me.kuehle.carreport 2012-08-23
>>>>>>> abf4fd70155c2d870e029171d4714a16586f4624
mixare-0061.apk org.mixare
mixare-0062.apk org.mixare
mixare-0063.apk org.mixare