Merge commit 'origin/master' into diabolik/umbraplayermodel

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

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index c455c484dbd8baf60965ae21e8b69c4451a6392c..cdf28d72977e9a59810075d176a78b7154e6938b 100644 (file)
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -1,13 +1,10 @@
-**Team Leaders:
+(THIS FILE IS A HUGE TODO)
+(YES, REALLY, NOTHING HERE IS TRUE)
+(PLEASE FIX THIS FILE)
 
-Lee Vermeulen
-*Project Founder and Co-Designer
 
-Forest "LordHavoc" Hale
-*Lead Programmer and Co-Designer
+**Team Leaders:
 
-Rudolf "div0" Polzer
-*Programmer
 
 
 **Project maintainers:
@@ -19,6 +16,9 @@ Maik "SavageX" Merten
 
 **Development Team:
 
+Rudolf "div0" Polzer
+*Programmer
+
 Andreas "Black" Kirsch
 *Programmer
 
@@ -118,6 +118,9 @@ Gerd "Elysis" Raudenbusch
 Marius "GreEn`mArine" Shekow
 *Programmer
 
+Forest "LordHavoc" Hale
+*DarkPlaces Engine Programmer
+
 Braden "meoblast001" Walters
 *Music
 
@@ -169,6 +172,7 @@ Jitspoe
 Jody Gallagher
 Juergen "LowDragon" Timm
 Lee David Ash
+Lee Vermeulen
 Mathieu "Elric" Olivier
 Mephisto
 MirceaKitsune