# HG changeset patch # User marseille@KungFuh # Date 1239124061 -7200 # Node ID eb9112a00b024f176cb9cf8ce8a676727ca03370 # Parent a02d227ac5a61a49f76e484d8cb9065463ed2b99# Parent fb3e3ed4bafca4667c24a177f185d20934b960d7 Merge. diff -r a02d227ac5a6 -r eb9112a00b02 AndroidManifest.xml --- a/AndroidManifest.xml Tue Apr 07 12:33:59 2009 +0200 +++ b/AndroidManifest.xml Tue Apr 07 19:07:41 2009 +0200 @@ -2,7 +2,7 @@ - + diff -r a02d227ac5a6 -r eb9112a00b02 res/drawable/background.png Binary file res/drawable/background.png has changed diff -r a02d227ac5a6 -r eb9112a00b02 res/drawable/xmpp.jpg Binary file res/drawable/xmpp.jpg has changed diff -r a02d227ac5a6 -r eb9112a00b02 res/values/style.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/values/style.xml Tue Apr 07 19:07:41 2009 +0200 @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file