aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbgrozev <boris@jitsi.org>2015-07-29 17:27:41 -0500
committerbgrozev <boris@jitsi.org>2015-07-29 17:27:41 -0500
commitd2bac43d3c7c045c82dce2a700a97950bf1545b4 (patch)
tree43040189884dd12c46554c48d70a7e9057db2aa6
parenta8d6506be90407924c4c566c10fe79cb4ebdb1a2 (diff)
downloadjitsi-d2bac43d3c7c045c82dce2a700a97950bf1545b4.zip
jitsi-d2bac43d3c7c045c82dce2a700a97950bf1545b4.tar.gz
jitsi-d2bac43d3c7c045c82dce2a700a97950bf1545b4.tar.bz2
Fixes compilation in some environments.
-rw-r--r--src/net/java/sip/communicator/service/protocol/AccountManager.java33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/AccountManager.java b/src/net/java/sip/communicator/service/protocol/AccountManager.java
index 00e1a06..c608092 100644
--- a/src/net/java/sip/communicator/service/protocol/AccountManager.java
+++ b/src/net/java/sip/communicator/service/protocol/AccountManager.java
@@ -1,20 +1,20 @@
/*
- * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Copyright @ 2015 Atlassian Pty Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Copyright @ 2015 Atlassian Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package net.java.sip.communicator.service.protocol;
import java.util.*;
@@ -22,6 +22,7 @@ import java.util.*;
import net.java.sip.communicator.service.credentialsstorage.*;
import net.java.sip.communicator.service.protocol.event.*;
import net.java.sip.communicator.util.*;
+import net.java.sip.communicator.util.Base64; //disambiguate from java.util.Base64
import org.jitsi.service.configuration.*;
import org.osgi.framework.*;