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

Conflicts:
	metadata/triqita.obsqr.txt

metadata/com.androidemu.nes.txt

@@ -1,6 +1,6 @@
 Category:Games
 License:GPLv2+
-Web Site:nesoid.sf.net
+Web Site:http://nesoid.sf.net
 Source Code:http://sf.net/p/nesoid/code/
 Issue Tracker:http://sf.net/p/nesoid/tickets/
 

metadata/eu.domob.angulo.txt

@@ -0,0 +1,24 @@
+Category:Science & Education
+License:GPLv3
+Web Site:http://www.domob.eu/projects/angulo.php
+Source Code:http://sourceforge.net/scm/?type=svn&group_id=600412
+Issue Tracker:http://sourceforge.net/tracker/?group_id=600412
+Donate:http://www.domob.eu/donate.php
+
+Summary:Angle Measuring
+Description:
+Angulo allows to measure angles by pointing the device, using the internal
+acceleration (gravity) and magnetic sensors.  The interface is very simple
+and easy-to-use.
+.
+
+Repo Type:git-svn
+Repo:https://angulo.svn.sourceforge.net/svnroot/angulo/trunk
+
+#Wrong revision for this one? The resulting APK is labelled as 1.1
+#Build Version:1.0,10000,25,update=force
+Build Version:1.1,10100,29,update=force
+
+Update Check Mode:None
+Current Version:1.1
+Current Version Code:10100

metadata/org.beide.bomber.txt

@@ -0,0 +1,22 @@
+Category:Games
+License:GPLv3
+Web Site:
+Source Code:https://github.com/beide/Bomber-for-android
+Issue Tracker:https://github.com/beide/Bomber-for/android/issues
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=kees%40huibertsbloembollen%2enl&lc=NL&item_name=Sophie%27s%20software&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
+
+Summary:Single player arcade game.
+Description:
+Bomber is a single player arcade game. The player is invading various cities in a 
+plane that is decreasing in height.
+
+The goal of the game is to destroy all the buildings and advance to the next level.
+Each level gets a harder by increasing the speed of the plane and the height of
+the buildings.
+.
+
+Repo Type:git
+Repo:git://github.com/beide/Bomber-for-android.git
+
+Build Version:1.0,1,11fc0eafff0b7c16ddb34cce8ff0a692cfd7b5b8
+

metadata/org.beide.droidgain.txt

@@ -0,0 +1,18 @@
+Category:Multimedia
+License:GPLv3
+Web Site:
+Source Code:https://github.com/beide/Droidgain
+Issue Tracker:https://github.com/beide/Droidgain/issues
+Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=kees%40huibertsbloembollen%2enl&lc=NL&item_name=Sophie%27s%20software&currency_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted
+
+Summary:MP3 Normalizer
+Description:
+Normalizes mp3 files (it makes them all sound equally loud).
+.
+
+Repo Type:git
+Repo:git://github.com/beide/Droidgain.git
+
+#Disabled build - NDK errors
+#Build Version:1.0,1,3cf8be7ebcff4470199c95271537790dc7416063,buildjni=yes
+

metadata/org.wikipedia.txt

@@ -16,8 +16,8 @@ Build Version:1.0,1,v1.0-android
 Build Version:1.0.2,3,a1dc1d87ac85351f44babbb9101e2311e89924b3
 Build Version:1.0.3,4,68957ccea4209347833997169f1bcf298beee7d9
 Build Version:1.1.1,11,9c630ba8b5e65ccd284e8c87501a8475e8bc07c5
-Build Version:1.2,16,b259ea459bd4494126e582ef5833c87d54a7b595
-Build Version:1.2.1,17,8c03dda8e
+Build Version:1.2,16,b259ea459bd4494126e582ef5833c87d54a7b595,submodules=yes
+Build Version:1.2.1,17,8c03dda8e,submodules=yes
 
 Update Check Mode:Market
 Current Version:1.2.1

metadata/triqita.obsqr.txt

@@ -15,4 +15,4 @@ Repo Type:hg
 Repo:https://bitbucket.org/trikita/obsqr
 
 #Native code doesn't build for some reason
-#Build Version:2.4,9,071341595ce3,target=android-15,buildjni=yes
+#Build Version:2.4,9,9cc4cd1804c0,target=android-15,buildjni=yes