diff options
| author | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
| commit | ac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch) | |
| tree | 044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/main/res/layout | |
| parent | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff) | |
| parent | 59985587c758f93844df7600f18c0837c672f259 (diff) | |
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/log_fragment.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_silders.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/layout/log_window.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/vpnstatus.xml | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/app/src/main/res/layout/log_fragment.xml b/app/src/main/res/layout/log_fragment.xml index 491882a9..ab070117 100644 --- a/app/src/main/res/layout/log_fragment.xml +++ b/app/src/main/res/layout/log_fragment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> diff --git a/app/src/main/res/layout/log_silders.xml b/app/src/main/res/layout/log_silders.xml index 152407f9..4196e243 100644 --- a/app/src/main/res/layout/log_silders.xml +++ b/app/src/main/res/layout/log_silders.xml @@ -2,7 +2,7 @@ <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> @@ -63,4 +63,11 @@ </RadioGroup> + + <CheckBox + tools:checked="true" + android:id="@+id/clearlogconnect" + android:text="@string/clear_log_on_connect" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/log_window.xml b/app/src/main/res/layout/log_window.xml index fcc7aa7a..7c25dcfa 100644 --- a/app/src/main/res/layout/log_window.xml +++ b/app/src/main/res/layout/log_window.xml @@ -1,5 +1,5 @@ <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml index 2d77bbab..b304ad10 100644 --- a/app/src/main/res/layout/vpnstatus.xml +++ b/app/src/main/res/layout/vpnstatus.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> |