aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/plugin
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2014-07-25 09:15:15 +0300
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2014-07-25 09:15:15 +0300
commit8aff7cfa8fe90104b39b2efe80ee458f04d27abe (patch)
tree5364a009674f68bff0c1f5882606790bd73ca9bc /src/net/java/sip/communicator/plugin
parent47de77317ab59f5a1406ce2444238c128ff44ce7 (diff)
downloadjitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.zip
jitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.tar.gz
jitsi-8aff7cfa8fe90104b39b2efe80ee458f04d27abe.tar.bz2
Fixes the compilation on JDK 8.
Diffstat (limited to 'src/net/java/sip/communicator/plugin')
-rw-r--r--src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
index a4c47e4..e4b91e8 100644
--- a/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
+++ b/src/net/java/sip/communicator/plugin/otr/OtrConfigurator.java
@@ -8,7 +8,7 @@ package net.java.sip.communicator.plugin.otr;
import java.util.*;
-import org.bouncycastle.util.encoders.*;
+import org.bouncycastle.util.encoders.Base64; // disambiguation
import org.jitsi.service.configuration.*;
/**