Merge remote branch 'origin/master' into samual/keepaway

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index b29da88b8b575af29f351e16d15d7a7c95b7dcc8..ec46525c90a1ec87dea004ba58f94e62ad837625 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -20,8 +20,13 @@ FruitieX (game / web)
 *3D Art
 morphed
 
+*Concept Art
+LJFHutch
+theShadow
+
 *Level Design
 FruitieX
+MirceaKitsune
 
 *Music / Sound FX
 mand1nga
@@ -52,6 +57,8 @@ by Forest "LordHavoc" Hale
 Antonio "terencehill" Piu
 Ben "MooKow" Banker
 Calinou
+chooksta
+Cuinn "Cuinnton" Herrick
 Kristian "morfar" Johansson
 kojn
 Maik "SavageX" Merten
@@ -105,7 +112,6 @@ MauveBib
 Mephisto
 michaelb
 Michael "Tenshihan" Quinn
-MirceaKitsune
 Munyul
 Netzwerg
 NoelCower