summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchwertspize <Schwertspize@users.noreply.github.com>2015-10-28 20:13:21 +0100
committerSchwertspize <Schwertspize@users.noreply.github.com>2015-10-28 20:13:21 +0100
commite02313c7ead65b8a42c6094cb58638944de4da2a (patch)
tree520afa5fda6b19c66649449257e65fa009321499
parentMerge pull request #2575 from Schwertspize/patch-1 (diff)
downloadcuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar.gz
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar.bz2
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar.lz
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar.xz
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.tar.zst
cuberite-e02313c7ead65b8a42c6094cb58638944de4da2a.zip
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS5
1 files changed, 3 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 153611eba..4fbd3b7fd 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -14,9 +14,9 @@ jan64
jasperarmstrong
keyboard
Lapayo
+linnemannr (Reid Linnemann)
lkolbly
Luksor
-linnemannr (Reid Linnemann)
M10360
marmot21
Masy98
@@ -26,14 +26,15 @@ MikeHunsinger
missingchar (mathias-github)
mtilden
nesco
+NiLSPACE (formerly STR_Warrior)
p-mcgowan
rs2k
SafwatHalaby (Safwat Halaby)
SamJBarney
+Schwertspize
Seadragon91 (Lukas Pioch)
Sofapriester
SphinxC0re
-NiLSPACE (formerly STR_Warrior)
structinf (xdot)
Sxw1212
Taugeshtu