# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1238607058 -7200
# Node ID b6d4f4af9e4ca18214ed868fb13d9775030ce8c9
# Parent  e7a787b81100aa7c582e8a3de063c9f89b8120e8
Correction du merge

diff -r e7a787b81100 -r b6d4f4af9e4c AndroidManifest.xml
--- a/AndroidManifest.xml	Wed Apr 01 19:24:05 2009 +0200
+++ b/AndroidManifest.xml	Wed Apr 01 19:30:58 2009 +0200
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name">
+	<application android:label="@string/app_name" android:name="BeemApplication">
 		<activity android:name=".ui.Beem" android:label="@string/app_name">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />