diff options
| author | kwadronaut <kwadronaut@leap.se> | 2016-09-19 12:38:29 +0200 |
|---|---|---|
| committer | kwadronaut <kwadronaut@leap.se> | 2016-09-19 12:38:29 +0200 |
| commit | f9c44da143a2d29baac6260c2e5caf9a96dacbc3 (patch) | |
| tree | c2435766b6a8d7ddd70f2a0dcfc501a7d93c45f4 /app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | |
| parent | 00ebc6d66ff9e8a0fa01b808ce7dbd0335933baf (diff) | |
| parent | 56ba118a5713fe0e24120815cd28db141709a497 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 45f09c8e..130084f5 100644 --- a/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java +++ b/app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java @@ -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 */ @@ -15,7 +15,7 @@ import de.blinkt.openvpn.fragments.LogFragment; /** * Created by arne on 13.10.13. */ -public class LogWindow extends Activity { +public class LogWindow extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); |