Commit graph

4 commits

Author SHA1 Message Date
Spigot
61d5d29069 Fix some merge conflicts
By: md_5 <git@md-5.net>
2014-03-23 15:21:51 +11:00
Spigot
3985d6815c Rebuild patch hashes, fix build.
By: md_5 <git@md-5.net>
2014-03-10 09:14:45 +11:00
Spigot
7073c502e9 Upstream merge
By: Thinkofdeath <thethinkofdeath@gmail.com>
2014-02-12 13:48:26 +00:00
Spigot
975187b00f Pop tick loop patch to top
By: md_5 <git@md-5.net>
2014-01-22 19:19:39 +11:00
Renamed from CraftBukkit-Patches/0032-Prevent-Shutdown-Hang.patch (Browse further)