summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 17:26:45 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 17:27:20 +0100
commit1f938b721b762a608efb8faee1913904c2cb1a77 (patch)
treee500ae367564cda04dd461ec86887233e62b213a
parentMerge branch 'master' into threadsafequeue (diff)
downloadcuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar.gz
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar.bz2
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar.lz
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar.xz
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.tar.zst
cuberite-1f938b721b762a608efb8faee1913904c2cb1a77.zip
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 977122047..b15b6d502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ cloc.xsl
## emacs
*.*~
*~
+*.orig
# world inside source
ChunkWorx.ini