Merge branch 'release'

Browse Source

Conflicts:
	.gitignore
	lib/bukkit-0.0.1-SNAPSHOT.jar

...

This commit is contained in:

snowleo

2011-06-11 13:02:34 +02:00

parent dea44d7cbc 4051a377c3

commit dfad01d558

7 changed files with 88 additions and 1 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.