diff options
author | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2016-02-07 10:43:26 +0100 |
commit | 433754368ff4d7339f09024960b5ed92d3452b7e (patch) | |
tree | 79aa4772f46785d0c1a61285777c530a46499ee4 /app/src/main/java/de/blinkt/openvpn/activities/LogWindow.java | |
parent | 64e71b3972c3d633f199058a94b5a2be0c7bb14e (diff) | |
parent | 8e67e4d2167f2508d7f069af4d69f0f2931844a7 (diff) |
Merge branch 'feature/update-ics-openvpn' 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); |