Merge branch 'master' into mirceakitsune/sandbox

[xonotic/xonotic-data.pk3dir.git] / xonotic-credits.txt

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 2b6e39f777ad1b7379653af47f0bd0f69240d967..fba2a0ab2c0670513ae2566cb3018a4278a77607 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -4,7 +4,8 @@ Rudolf "divVerent" Polzer
 Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
-mand1nga
+Samual "Ares" Lenks
+Saulo "mand1nga" Gil
 Jakob "tZork" Markström Gröhn
 
 **Coordinators
@@ -37,6 +38,7 @@ mand1nga
 Merlijn Hofstra
 remaxim
 Stephan
+Independent.nu
 
 *Engine Code Additions & QA
 Rudolf "divVerent" Polzer
@@ -61,7 +63,7 @@ by Forest "LordHavoc" Hale
 **Translators
 
 *Dutch
-freefang
+Alexander "freefang" van Dam
 PinkRobot
 
 *German
@@ -108,13 +110,13 @@ Calinou
 chooksta
 cortez
 Cuinn "Cuinnton" Herrick
-eihrul
 Florian Paul "lda17h" Schmidt
-Florian Paul Schmidt
 kojn
 Kristian "morfar" Johansson
+kuniuthefrogg
 magorian
 Maik "SavageX" Merten
+Marvin "Mirio" Beck
 Mick Rippon
 MrBougo
 parasti
@@ -122,13 +124,11 @@ Paul Scott
 PlasmaSheep
 Przemysław "atheros" Grzywacz
 Ruszkai "C.Brutail" Ákos
-Samual Lenks
-Sc0rp
+{SC0RP} - Ian "ID" Dorrell
 Severin "sev" Meyer
 SoulKeeper_p
 Stephan "esteel" Stahl
 The player with the unnecessarily long name
-Vortex
 Wolfgang "Blub\0" Bumiller
 
 **Past Contributors
@@ -198,6 +198,7 @@ Supajoe
 Tei
 Tomaz
 Ulrich Galbraith
+Vortex
 William Libert
 William "Willis" Weilep
 Yves "EviLair" Allaire