diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-08-11 13:37:19 +0200 |
commit | eac4bf7d902dc2579983daa29bcb74ca14790de6 (patch) | |
tree | 1139702220deb293c2f68d712280ff81e5b23f7c /src/main/res/layout/message_null.xml | |
parent | 92864c6696cf776de356f5e9bbe403a691c8746d (diff) | |
parent | 4a051b65d1ee004aeea3bcb0a20d0bde1d2200ae (diff) |
Merged 1.5.2 into trz/master with conflicts resolved
Diffstat (limited to 'src/main/res/layout/message_null.xml')
-rw-r--r-- | src/main/res/layout/message_null.xml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml deleted file mode 100644 index 0e0f1c92..00000000 --- a/src/main/res/layout/message_null.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:background="#00000000"> - -</RelativeLayout>
\ No newline at end of file |