diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 22:01:59 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-06-25 22:01:59 +0100 |
| commit | 283a9ce9fa66427e342e236edfdec81cbd0fc01f (patch) | |
| tree | 4bd19425e0c22336323794f081b512f52abaee4b /EssentialsXMPP/src | |
| parent | 7ce9e42f35a151e4285809d4eea5f2e1f593a966 (diff) | |
| parent | ecfa7454843cb9f4af61127c1a59838c83bf94fd (diff) | |
| download | Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.gz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.lz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.tar.xz Essentials-283a9ce9fa66427e342e236edfdec81cbd0fc01f.zip | |
Merge branch 'master' into 3.0
More to follow
Conflicts:
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
Essentials/src/com/earth2me/essentials/Kit.java
Essentials/src/com/earth2me/essentials/Teleport.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/UserData.java
Essentials/src/com/earth2me/essentials/commands/Commandfly.java
Essentials/src/com/earth2me/essentials/commands/Commandgod.java
Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
Essentials/src/com/earth2me/essentials/commands/Commandmute.java
Essentials/src/items.csv
Essentials/src/messages.properties
Essentials/src/messages_cs.properties
Essentials/src/messages_da.properties
Essentials/src/messages_de.properties
Essentials/src/messages_en.properties
Essentials/src/messages_es.properties
Essentials/src/messages_fr.properties
Essentials/src/messages_it.properties
Essentials/src/messages_nl.properties
Essentials/src/messages_pl.properties
Essentials/src/messages_pt.properties
EssentialsSigns/src/com/earth2me/essentials/signs/SignBlockListener.java
EssentialsSigns/src/com/earth2me/essentials/signs/SignEntityListener.java
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
Diffstat (limited to 'EssentialsXMPP/src')
| -rw-r--r-- | EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 5ea94eab9..2f66da1b4 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -3,6 +3,7 @@ package com.earth2me.essentials.xmpp; import com.earth2me.essentials.api.IReload; import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.utils.Util; +import com.earth2me.essentials.Util; import java.io.File; import java.util.*; import java.util.logging.Handler; |