diff options
| author | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2015-01-19 16:31:59 +0100 |
| commit | 1e748855652780d225fd113320ffe1bceca5ba8e (patch) | |
| tree | a0b257591ef9f3b4c662165c20ffad120fcdeba1 /app/src/main/java/de/blinkt/openvpn/activities | |
| parent | fab7a89f44d59f3c7ea7505ae05a3c8b4c67c0b8 (diff) | |
| parent | 45cf8b1cc3085a575c5a460eb7d8191ee6033da4 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/activities')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java index 4940d5d6..dfd815e4 100644 --- a/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java +++ b/app/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; diff --git a/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java b/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java index 5e4f9517..45f09c8e 100644 --- a/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java +++ b/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2012-2014 Arne Schwabe - * Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt + * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ package de.blinkt.openvpn.activities; |