summaryrefslogtreecommitdiff
path: root/src/se/leap/openvpn/OpenVPNThread.java
diff options
context:
space:
mode:
authorSean Leonard <meanderingcode@aetherislands.net>2013-10-20 14:15:22 -0700
committerSean Leonard <meanderingcode@aetherislands.net>2013-10-20 14:15:22 -0700
commitd3413b007a8f89e8a222455b5dd571b0e05e5a78 (patch)
tree40981e15c9eff744c71278e42cd0aba203c23f08 /src/se/leap/openvpn/OpenVPNThread.java
parent04fedee9f6be1e3e46a8c91c9a39343513cc6fe1 (diff)
parentf657ab24f95016173d037d1e4714bb07bcd33fc2 (diff)
Merge branch 'feature/rebrand-as-bitmask' into develop
Diffstat (limited to 'src/se/leap/openvpn/OpenVPNThread.java')
-rw-r--r--src/se/leap/openvpn/OpenVPNThread.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/se/leap/openvpn/OpenVPNThread.java b/src/se/leap/openvpn/OpenVPNThread.java
index 3f9a0d91..0c383ab0 100644
--- a/src/se/leap/openvpn/OpenVPNThread.java
+++ b/src/se/leap/openvpn/OpenVPNThread.java
@@ -7,7 +7,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.LinkedList;
-import se.leap.leapclient.R;
+
+import se.leap.bitmaskclient.R;
import android.util.Log;
import se.leap.openvpn.OpenVPN.LogItem;