# HG changeset patch
# User nikita@nikita-lab
# Date 1243888013 -7200
# Node ID b68125d975da2e0baa7511f6627577dd1455cf58
# Parent  1fb348d4699ba9b5a621636a2c9186e3d6e5e091# Parent  ae60ee90b7ddd4b585c38787b0404b3487edf05b
merge

diff -r ae60ee90b7dd -r b68125d975da AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Jun 01 20:25:59 2009 +0200
+++ b/AndroidManifest.xml	Mon Jun 01 22:26:53 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 ae60ee90b7dd -r b68125d975da default.properties
--- a/default.properties	Mon Jun 01 20:25:59 2009 +0200
+++ b/default.properties	Mon Jun 01 22:26:53 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