Merge branch 'bukkitupdate'

Browse Source

Conflicts:
	EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java

...

This commit is contained in:

snowleo

2011-06-23 13:49:37 +02:00

parent c6aa5f1e68 ca9364d25b

commit 9d6727daf2

8 changed files with 155 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

lib/bukkit-0.0.1-SNAPSHOT.jar

Binary file not shown.

BIN

lib/craftbukkit-0.0.1-SNAPSHOT.jar

Binary file not shown.