diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-05 16:51:16 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-05 16:51:16 +0100 |
| commit | 6544b8d32ccf81a6c1d832217642b873be8dc6b7 (patch) | |
| tree | b07723b530e20b23ae83de822387f6551ea7f9f4 /app/src/main/res/layout/vpnstatus.xml | |
| parent | 713c3a98f53a6bd1ad94e90f28d3e37d20abfab9 (diff) | |
| parent | 5304543ebd60778ad46123cd63142e27627fa150 (diff) | |
Merge branch 'bug/Android-5-Lollipop-VPN-fails-#6232' into develop
Diffstat (limited to 'app/src/main/res/layout/vpnstatus.xml')
| -rw-r--r-- | app/src/main/res/layout/vpnstatus.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/res/layout/vpnstatus.xml b/app/src/main/res/layout/vpnstatus.xml index eb7c53ee..2fd65b4c 100644 --- a/app/src/main/res/layout/vpnstatus.xml +++ b/app/src/main/res/layout/vpnstatus.xml @@ -1,4 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (c) 2012-2014 Arne Schwabe + ~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + --> + <merge xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"> |