Update from upstream SpigotMC

a3168ab2ce4 9b45d9fa8d3 b43a31a5c25 a926b96d5d1 d6b5ba7ca03 bb782d07aed 5a74d55c678 47b1dff3e68 [M]
2014-12-18 17:33:08 -06:00
parent f920086bbd
commit afa737e5a5
31 changed files with 36 additions and 439 deletions
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -37,11 +37,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <relativePath>../pom.xml</relativePath>
 +  </parent>
 +
-   <repositories>
-     <repository>
-       <id>repobo-snap</id>
-@@ -0,0 +0,0 @@
- 
   <dependencies>
     <dependency>
 -      <groupId>org.bukkit</groupId>
@@ -125,4 +120,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
         Properties properties = new Properties();
 
         if (stream != null) {
--
+-- 
+1.9.4.msysgit.2
+