# HG changeset patch # User Da Risk # Date 1255706539 -7200 # Node ID 40f0b4dda4cb43b8e117582bfbba5b794ce89a48 # Parent fbb5d00cb7eeed646272f46b754cf896c65e17ab# Parent 17300b201cf5190b24dbf4dd7b8a502e863fa2d2 merge diff -r 17300b201cf5 -r 40f0b4dda4cb AndroidManifest.xml --- a/AndroidManifest.xml Thu Oct 15 17:36:51 2009 +0200 +++ b/AndroidManifest.xml Fri Oct 16 17:22:19 2009 +0200 @@ -87,6 +87,6 @@ - +