diff options
author | Parménides GV <parmegv@sdf.org> | 2014-09-26 13:04:26 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 13:04:26 +0200 |
commit | bbf877a099112acbf34589b01503c3f5ee135dc0 (patch) | |
tree | 101d4fb8e347bd040ad963248611fd1684a12cd9 /ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | |
parent | 0a3900e145866c2f5b0adbd8c9c3fac2fb56efcb (diff) | |
parent | 22b7ee4614a2f47d55496de8a9b55040c0f4ba85 (diff) |
Merge branch 'develop'0.7.0
Diffstat (limited to 'ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java')
-rw-r--r-- | ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java index 218dd000..8c899efc 100644 --- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java +++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java @@ -111,6 +111,7 @@ public class LaunchVPN extends Activity { } } + @Override protected void onActivityResult (int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); |