# HG changeset patch
# User Philippe Lago <lago_p@epitech.net>
# Date 1240566714 -7200
# Node ID b832216810ae996530070fd1d064369824d23441
# Parent  fd5c328fa330752259ff0c761e033d275e603d2b# Parent  d076437706a4d125789102194ac1bccd564e7bc8
merge beem-ui

diff -r d076437706a4 -r b832216810ae res/drawable/beem_contactlist_header_1.png
Binary file res/drawable/beem_contactlist_header_1.png has changed
diff -r d076437706a4 -r b832216810ae res/drawable/signal.png
Binary file res/drawable/signal.png has changed
diff -r d076437706a4 -r b832216810ae res/layout/contactlistgroup.xml
--- a/res/layout/contactlistgroup.xml	Fri Apr 24 01:59:28 2009 +0200
+++ b/res/layout/contactlistgroup.xml	Fri Apr 24 11:51:54 2009 +0200
@@ -4,6 +4,7 @@
         android:layout_width="fill_parent"
         android:layout_height="50sp"
 		android:paddingTop="5sp"
+		android:background="@drawable/beem_contactlist_header_1"
 		android:gravity="center_vertical">
 
         <TextView android:id="@+id/textgroup"
diff -r d076437706a4 -r b832216810ae res/menu/contactlistmenu.xml
--- a/res/menu/contactlistmenu.xml	Fri Apr 24 01:59:28 2009 +0200
+++ b/res/menu/contactlistmenu.xml	Fri Apr 24 11:51:54 2009 +0200
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:title="@string/MenuConnection" android:id="@+id/account_edit" android:icon="@drawable/xmpp"/>
 	<item android:title="@string/MenuAddContact" android:id="@+id/add_contact" android:icon="@drawable/buddie_robot"/>
-	<item android:title="@string/MenuAccountAbout" android:id="@+id/account_about"/>
+	<item android:title="@string/MenuAccountAbout" android:id="@+id/account_about" android:icon="@drawable/signal"/>
 	<item android:title="@string/MenuAccountCreate" android:id="@+id/account_create"/>
 </menu>
diff -r d076437706a4 -r b832216810ae src/com/beem/project/beem/ui/SendIM.java
--- a/src/com/beem/project/beem/ui/SendIM.java	Fri Apr 24 01:59:28 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Fri Apr 24 11:51:54 2009 +0200
@@ -207,9 +207,8 @@
     }
 
     /**
-     * Callback for menu creation. <<<<<<< local
-     * @param menu the menu created =======
-     * @param menu The created menu >>>>>>> other
+     * Callback for menu creation.
+     * @param The created menu
      * @return true on success, false otherwise
      */
     @Override