Merge branch 'patch-2' of https://github.com/GunfighterJ/Essentials into patch-2

Browse Source

Conflicts:
	Essentials/src/com/earth2me/essentials/commands/Commandbook.java

...

This commit is contained in:

GunfighterJ 2013-01-13 16:31:29 -06:00

parent 84c06fb746 7e3fd48956

commit a8088fb8c8

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

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

Diff Content Not Available