Upstream Merge

By: md_5 <md_5@live.com.au>
2013-10-24 21:23:24 +11:00
parent dbe0e9acde
commit 9658a61088
19 changed files with 90 additions and 88 deletions
--- a/CraftBukkit-Patches/0023-Netty.patch
+++ b/CraftBukkit-Patches/0023-Netty.patch
@@ -1,14 +1,14 @@
-From d7703ce7f9edfb6f80761546feb3658809bd75e8 Mon Sep 17 00:00:00 2001
+From 37c05ef56a5463e718e6ce1dcc01b35949af4ddb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 09:06:29 +1000
 Subject: [PATCH] Netty


 diff --git a/pom.xml b/pom.xml
-index c155913..3ca28d6 100644
+index e165937..cc5d9da 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -112,6 +112,21 @@
+@@ -114,6 +114,21 @@
       <artifactId>trove4j</artifactId>
       <version>3.0.3</version>
     </dependency>
@@ -1488,5 +1488,5 @@ index 0000000..d3a9cab
 +    DATA;
 +}
 -- 
-1.8.1.2
+1.8.3.2