# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1271007271 -7200
# Node ID 344a06703472764521347275ea52c6f746404fe8
# Parent  559845cadddbda78ee9097fd337203fa5eb318be# Parent  04e2c0f031273e70dd8467a8086b67f65a171363
merge

diff -r 559845cadddb -r 344a06703472 .hgtags
--- a/.hgtags	Sun Apr 11 19:32:25 2010 +0200
+++ b/.hgtags	Sun Apr 11 19:34:31 2010 +0200
@@ -2,3 +2,4 @@
 bccd99644eac57bb19a239697704db089dd585f7 0.1
 af35b5109f172411de5798991e89919b7ed5cf85 0.1.1
 25f6fded204ab05c9f89556cbc08cd191e0f2c52 0.1.2
+c77d496146964d9239b4c45446d99b960415a4a6 0.1.3
diff -r 559845cadddb -r 344a06703472 AndroidManifest.xml
--- a/AndroidManifest.xml	Sun Apr 11 19:32:25 2010 +0200
+++ b/AndroidManifest.xml	Sun Apr 11 19:34:31 2010 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="com.beem.project.beem" android:versionCode="3"
-	android:versionName="0.1.2">
+	package="com.beem.project.beem" android:versionCode="4"
+	android:versionName="0.1.3">
 	<application android:label="@string/app_name"
 		android:icon="@drawable/beem_launcher_icon_silver" android:theme="@style/Theme.BEEM.Default"
 		android:debuggable="true" android:name=".BeemApplication">