Upstream merge 2: Upstream merge harder

Browse Source

...

This commit is contained in:

Zach Brown

2014-07-01 21:22:52 -05:00

parent 00feb99ac2

commit aa6a324445

2 changed files with 2 additions and 2 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

Bukkit

+1 -1

Submodule Bukkit updated: 0d0ecc424c...165f5a8929

CraftBukkit

+1 -1

Submodule CraftBukkit updated: 66d9fc52bb...5b8d0b7cbc