missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	metadata/com.google.code.geobeagle.txt
	metadata/com.intervigil.micdroid.txt
	metadata/name.boyle.chris.sgtpuzzles.txt
	metadata/net.exclaimindustries.geohashandroid.txt
	metadata/org.opengpx.txt
	metadata/org.pyload.android.client.txt

Fix confilicts
This commit is contained in:
David Black 2012-07-19 14:15:15 +01:00
parent 87d7cbe56e e54c30d809
commit 6041d0d100
13 changed files with 68 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
metadata/com.google.code.geobeagle.txt
View file

@ -1,7 +1,7 @@
Category:Navigation
License:Apache 2.0
Web Site:http://code.google.com/p/geobeagle/
Source Code:http://code.google.com/p/geobeagle/source/list
Source Code:http://code.google.com/p/geobeagle/source/checkout
Issue Tracker:http://code.google.com/p/geobeagle/issues/list
Donate:
@ -16,7 +16,8 @@ Need more help? Join our discussion group!
.
Repo Type:hg
Repo:https://code.google.com/geobeagle/
Repo:https://code.google.com/p/geobeagle/
Build Version:1.4.15,206,6bbcd09d5d70
#Needs dependencies (unspecified, but at least roboguice)
#Build Version:1.4.15,206,a868e85b7acf,subdir=trunk/GeoBeagle

3
metadata/com.intervigil.micdroid.txt
View file

@ -1,3 +1,4 @@
Disabled:Proprietary blobs
Category:Multimedia
License:GPLv2+
Web Site:http://www.intervigil.net/pages/micdroid
@ -9,7 +10,7 @@ Summary:Pitch correct your voice
Description:
MicDroid is a small Android app that produces the pitch correction effect made famous by T-Pain.
It's based on the AutoTalent pitch-correcting LADSPA plugin, by Tom Baran,
It's based on the AutoTalent pitch-correcting LADSPA plugin, by Tom Baran,
.

3
metadata/com.morphoss.acal.txt
View file

@ -33,8 +33,9 @@ Build Version:1.35,37,r1.35,target=android-8
Build Version:1.36,38,r1.36,target=android-8
Build Version:1.53,53,9933536cb926ca457d5fa4e6cf827b063fbab709,target=android-8
Build Version:1.54,54,r1.54,target=android-8
Build Version:1.55,55,r1.55,target=android-8
Update Check Mode:RepoManifest
Current Version:1.54
Current Version Code:55
Current Version Code:54

24
metadata/eu.domob.anacam.txt Normal file
View file

@ -0,0 +1,24 @@
Category:Multimedia
License:GPLv3
Web Site:http://www.domob.eu/projects/anacam.php
Source Code:http://sourceforge.net/p/anacam/code/
Issue Tracker:http://sourceforge.net/p/anacam/tickets/
Donate:http://www.domob.eu/donate.php
Summary:Anaglyph Camera
Description:
With this app, you can easily take 3D stereoscopic "anaglyph" pictures
with your device's camera. Simply take two shots at slightly different
locations, and watch the result with red-cyan (or others)
glasses! AnaCam includes a live preview, so that you can find the
best position for the second picture before you take it.
.
Repo Type:git-svn
Repo:svn://svn.code.sf.net/p/anacam/code/trunk
Build Version:1.0,10000,28,buildjni=no
Update Check Mode:None
Current Version:1.0
Current Version Code:10000

6
metadata/name.boyle.chris.sgtpuzzles.txt
View file

@ -7,10 +7,12 @@ Donate:
Summary:33 single-player logic games
Description:
This is a port of Simon Tatham's Portable Puzzle Collection, a collection of 34 single-player logic games. I used to very much enjoy playing this on PalmOS, so I decided to take it with me when I bought a G1.
A port of Simon Tatham's Portable Puzzle Collection, a collection of 34 single-player
logic games.
.
Repo Type:git
Repo:git://github.com/chrisboyle/sgtpuzzles.git
Build Version:9411.2,70,bb35b1265f
#This doesn't build
#Build Version:9411.2,70,bb35b1265f,buildjni=yes

1
metadata/net.exclaimindustries.geohashandroid.txt
View file

@ -1,3 +1,4 @@
Disabled:Can't build, source 'incomplete' due to API keys
Category:Navigation
License:New BSD
Web Site:https://code.google.com/p/geohashdroid/

5
metadata/net.rocrail.androc.txt
View file

@ -36,8 +36,9 @@ Build Version:345,345,345,target=android-14
Build Version:347,347,347,target=android-14
Build Version:348,348,348,target=android-14
Build Version:350,350,350,target=android-14
Build Version:351,351,351,target=android-14
Update Check Mode:Market
Current Version:350
Current Version Code:350
Current Version:351
Current Version Code:351

5
metadata/org.fox.ttrss.txt
View file

@ -19,8 +19,9 @@ Build Version:0.5.7,72,cf3357d49b3b
Build Version:0.6.1,74,277c2e0e473
Build Version:0.6.7,83,969d3bb
Build Version:0.6.9,85,9341df4c2191e83cb60beed38935d881b9ff4b04
Build Version:0.6.10,86,e68c90cbceab1319
Update Check Mode:Market
Current Version:0.6.9
Current Version Code:85
Current Version:0.6.10
Current Version Code:86

2
metadata/org.opengpx.txt
View file

@ -29,4 +29,4 @@ Variant 3 (Online):
Repo Type:git-svn
Repo:http://opengpx.googlecode.com/svn/trunk/
Build Version:1.2.0,236,r159
Build Version:1.2.0,236,159

5
metadata/org.pocketworkstation.pckeyboard.txt
View file

@ -18,8 +18,9 @@ Build Version:v1.20,1020,e703fa82a4c3,subdir=java,target=android-11,buildjni=yes
Build Version:v1.22,1022,154e21230e81,subdir=java,target=android-11,buildjni=yes
Build Version:v1.29,1029,1.29,subdir=java,target=android-11,buildjni=yes,prebuild=./AutoVersion.sh
Build Version:v1.31,1031,065ed34b811c,subdir=java,target=android-11,buildjni=yes,prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && ./AutoVersion.sh
Build Version:v1.33,1033,81d7ba77fb3f,subdir=java,target=android-11,buildjni=yes,prebuild=sed -i "s/Hg-ident/hg ident/" AutoVersion.sh && ./AutoVersion.sh
Update Check Mode:Market
Current Version:v1.31
Current Version Code:1031
Current Version:v1.33
Current Version Code:1033

2
metadata/org.pyload.android.client.txt
View file

@ -27,5 +27,5 @@ The client let you do the following things:
Repo Type:hg
Repo:https://bitbucket.org/ranan/pyload-android
Build Version:0.2.5,12,74ce7f5c81b0
Build Version:0.2.5,12,74ce7f5c81b0,prebuild=mv lib/* libs/ && rm -r lib/

18
metadata/org.wiktionary.txt Normal file
View file

@ -0,0 +1,18 @@
Category:Internet
License:GPLv2
Web Site:https://github.com/wikimedia/WiktionaryMobile
Source Code:https://github.com/wikimedia/WiktionaryMobile
Issue Tracker:https://github.com/wikimedia/WiktionaryMobile/issues
Summary:Wiktionary client
Description:
Client for Wiktionary, a dictionary.
.
Repo Type:git
Repo:https://github.com/wikimedia/WiktionaryMobile.git
Build Version:1.0.1,1,62466913087ca6,submodules=yes
Update Check Mode:Market

4
metadata/stericson.busybox.donate.txt
View file

@ -31,6 +31,6 @@ Build Version:7.6.1,112,!No source available
Build Version:7.8.3,117,!No source available
Update Check Mode:Market
Current Version:8.4
Current Version Code:125
Current Version:8.9
Current Version Code:130