From fa3179123ef5e196f1846391de7ea9345e3aa455 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Thu, 23 Aug 2012 12:09:34 +0100
Subject: [PATCH] merge

---
 metadata/eu.domob.bjtrainer.txt               | 23 +++++++++++++++++++
 metadata/me.guillaumin.android.osmtracker.txt |  6 ++---
 metadata/paulscode.android.mupen64plusae.txt  |  4 ++--
 3 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 metadata/eu.domob.bjtrainer.txt

diff --git a/metadata/eu.domob.bjtrainer.txt b/metadata/eu.domob.bjtrainer.txt
new file mode 100644
index 0000000000..38f45572d4
--- /dev/null
+++ b/metadata/eu.domob.bjtrainer.txt
@@ -0,0 +1,23 @@
+Category:Games
+License:GPLv3
+Web Site:http://www.domob.eu/projects/bjtrainer.php
+Source Code:https://sourceforge.net/p/bjtrainer/code/
+Issue Tracker:https://sourceforge.net/p/bjtrainer/tickets/
+Donate:http://www.domob.eu/donate.php
+
+Summary:Learning BlackJack
+Description:
+This app helps you in learning to play BlackJack well,
+by simulating the game for you and also telling you about
+sub-optimal decisions made.  It even includes a mode to
+systematically train all possible initial situations.
+.
+
+Repo Type:git-svn
+#Repo:https://bjtrainer.svn.sourceforge.net/svnroot/bjtrainer/trunk
+Repo:http://svn.code.sf.net/p/bjtrainer/code/trunk
+Build Version:0.1,100,31,update=force
+
+Update Check Mode:None
+Current Version:0.1
+Current Version Code:00100
diff --git a/metadata/me.guillaumin.android.osmtracker.txt b/metadata/me.guillaumin.android.osmtracker.txt
index b576c47a69..9711ed81c6 100644
--- a/metadata/me.guillaumin.android.osmtracker.txt
+++ b/metadata/me.guillaumin.android.osmtracker.txt
@@ -19,9 +19,9 @@ Repo:https://github.com/nguillaumin/osmtracker-android.git
 
 Build Version:0.5.6,21,0.5.6,target=android-8
 Build Version:0.5.7,22,eac27c8a37066988f784cbc2ad7e7a2ab0326839,target=android-8
-Build Version:0.5.8,23,623453d4f0,target=android-8
+Build Version:0.6.2,26,0.6.2,target=android-15
 
 Update Check Mode:Market
-Current Version:0.5.8
-Current Version Code:23
+Current Version:0.6.2
+Current Version Code:26
 
diff --git a/metadata/paulscode.android.mupen64plusae.txt b/metadata/paulscode.android.mupen64plusae.txt
index 554341e5f6..f99ebc230b 100644
--- a/metadata/paulscode.android.mupen64plusae.txt
+++ b/metadata/paulscode.android.mupen64plusae.txt
@@ -12,8 +12,8 @@ N64 emulator now in beta. See website for link to compatibility wiki
 Repo Type:git
 Repo:https://github.com/paulscode/mupen64plus-ae.git
 
-#haven't tried to build it, need ssh to machine :-( .see readme for howto
-#Build Version=1.9.2,14,1408b6,buildjni=yes,subdir=main
+#libcore.so don't exist it seems
+#Build Version:1.9.2,14,1408b6,buildjni=yes,subdir=main
 
 Update Check Mode:RepoManifest
 Current Version:1.9.2