snowleo 9d6727daf2 Merge branch 'bukkitupdate' ...

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

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

..

nbproject

Fix dependency

2011-06-07 21:55:31 +02:00

src

Merge branch 'bukkitupdate'

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

build.xml

Fix dependency

2011-06-07 21:55:31 +02:00

MANIFEST.MF

2.1 prerelease, part 2 of 3

2011-03-30 04:03:21 +00:00