diff options
| author | snowleo <schneeleo@gmail.com> | 2012-01-18 04:01:01 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-01-18 04:01:01 +0100 |
| commit | f0dd81ee000b333b2aca59b9949518c7686cceb1 (patch) | |
| tree | cf620b5603e1b25656550f87a37975b6dc5351af /EssentialsGroupManager/nbproject/genfiles.properties | |
| parent | 27b0cc86de8c21f089e0e68a5db3ebb42f4df2d2 (diff) | |
| parent | 5c1d49fd0efe56c24d6ae5f63f4d0cc31329243d (diff) | |
| download | Essentials-f0dd81ee000b333b2aca59b9949518c7686cceb1.tar Essentials-f0dd81ee000b333b2aca59b9949518c7686cceb1.tar.gz Essentials-f0dd81ee000b333b2aca59b9949518c7686cceb1.tar.lz Essentials-f0dd81ee000b333b2aca59b9949518c7686cceb1.tar.xz Essentials-f0dd81ee000b333b2aca59b9949518c7686cceb1.zip | |
Merge branch 'refs/heads/master' into 3.0
Did some tweaks, so that it actually works.
Conflicts:
Essentials/src/com/earth2me/essentials/Essentials.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/Util.java
Essentials/src/com/earth2me/essentials/commands/Commandhelpop.java
Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
Essentials/src/com/earth2me/essentials/commands/Commandmail.java
Essentials/src/com/earth2me/essentials/commands/Commandme.java
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
Essentials/src/com/earth2me/essentials/commands/Commandr.java
Essentials/src/com/earth2me/essentials/listener/EssentialsPlayerListener.java
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
build.xml
Diffstat (limited to 'EssentialsGroupManager/nbproject/genfiles.properties')
0 files changed, 0 insertions, 0 deletions