merge
authornikita@nikita-lab
Mon, 01 Jun 2009 23:05:47 +0200
changeset 247 c94d3d963725
parent 246 b68125d975da (diff)
parent 232 37d9a5828650 (current diff)
child 248 17422d221dc1
merge
--- 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> 
--- 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