Merge pull request #47 in SPIGOT/craftbukkit from ~BAMMERBOM/craftbukkit:master to master

* commit '3d1cdfa2b1d023934a9950e604e20e1140c11fce':
  Fix making craftbukkit patches.

makePatches.sh

@@ -12,6 +12,7 @@ for file in $(/bin/ls $cb)
 do
     echo "Diffing $file"
     sed -i 's/\r//' "$nms/$file"
+	sed -i 's/\r//' "$cb/$file"
     outName=$(echo nms-patches/"$(echo $file | cut -d. -f1)".patch)
     patchNew=$(diff -u "$nms/$file" "$cb/$file")
     if [ -f "$outName" ]