diff options
author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-20 14:15:22 -0700 |
---|---|---|
committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-20 14:15:22 -0700 |
commit | d3413b007a8f89e8a222455b5dd571b0e05e5a78 (patch) | |
tree | 40981e15c9eff744c71278e42cd0aba203c23f08 /src/se/leap/openvpn/MainActivity.java | |
parent | 04fedee9f6be1e3e46a8c91c9a39343513cc6fe1 (diff) | |
parent | f657ab24f95016173d037d1e4714bb07bcd33fc2 (diff) |
Merge branch 'feature/rebrand-as-bitmask' into develop
Diffstat (limited to 'src/se/leap/openvpn/MainActivity.java')
-rw-r--r-- | src/se/leap/openvpn/MainActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/se/leap/openvpn/MainActivity.java b/src/se/leap/openvpn/MainActivity.java index d33fd832..0a769b4d 100644 --- a/src/se/leap/openvpn/MainActivity.java +++ b/src/se/leap/openvpn/MainActivity.java @@ -1,7 +1,8 @@ package se.leap.openvpn; import java.util.List; -import se.leap.leapclient.R; + +import se.leap.bitmaskclient.R; import android.content.Intent; import android.preference.PreferenceActivity; |