Merge branch 'develop'0.9.2

1 files changed, 0 insertions, 34 deletions

diff --git a/ics-openvpn-stripped/main/src/main/res/layout-sw600dp/log_fragment.xml b/ics-openvpn-stripped/main/src/main/res/layout-sw600dp/log_fragment.xml
deleted file mode 100644
index 0bd3f991..00000000
--- a/ics-openvpn-stripped/main/src/main/res/layout-sw600dp/log_fragment.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2012-2014 Arne Schwabe
-  ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="horizontal"
-              android:padding="20dp"
-              tools:context=".LogWindow">
-
-
-    <LinearLayout
-        android:background="@drawable/white_rect"
-        android:elevation="1dp"
-            android:minWidth="300dp"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent">
-
-        <include layout="@layout/log_silders"/>
-
-        <include layout="@layout/vpnstatus"/>
-    </LinearLayout>
-
-    <ListView
-            android:id="@android:id/list"
-            android:transcriptMode="normal"
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"/>
-</LinearLayout>