# HG changeset patch
# User nikita@nikita-lab
# Date 1243890347 -7200
# Node ID c94d3d963725e48d765d649fded77eb29b72e24f
# Parent  b68125d975da2e0baa7511f6627577dd1455cf58# Parent  37d9a5828650e99feecec1b8844ba824f8b64fe7
merge

diff -r 37d9a5828650 -r c94d3d963725 AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Jun 01 21:04:35 2009 +0200
+++ b/AndroidManifest.xml	Mon Jun 01 23:05:47 2009 +0200
@@ -40,4 +40,5 @@
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
 	<uses-sdk android:minSdkVersion="3"></uses-sdk>
+
 </manifest> 
diff -r 37d9a5828650 -r c94d3d963725 default.properties
--- a/default.properties	Mon Jun 01 21:04:35 2009 +0200
+++ b/default.properties	Mon Jun 01 23:05:47 2009 +0200
@@ -7,6 +7,8 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
+# Project target.
+target=android-3
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
@@ -18,5 +20,3 @@
 #     apk-config-european=en,fr,it,de,es
 #     apk-config-northamerica=en,es
 apk-configurations=
-# Project target.
-target=android-3