From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Aug 2011 07:38:25 +0000 (+0200)
Subject: Merge remote branch 'origin/samual/update_credits'
X-Git-Tag: xonotic-v0.5.0~30
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=f4b429d47c4021ca6fce4e3fbe7760184fe92c0c;hp=ff839f0144eec852c7bff5095ed2db9fe54883dc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/update_credits'
---

diff --git a/xonotic-credits.txt b/xonotic-credits.txt
index 669c1ab9c..5c48a627f 100644
--- a/xonotic-credits.txt
+++ b/xonotic-credits.txt
@@ -4,6 +4,7 @@ Rudolf "divVerent" Polzer
 Tyler "-z-" Mulligan
 Merlijn Hofstra
 morphed
+Samual "Ares" Lenks
 mand1nga
 Jakob "tZork" Markström Gröhn
 
@@ -109,7 +110,6 @@ chooksta
 cortez
 Cuinn "Cuinnton" Herrick
 Florian Paul "lda17h" Schmidt
-Florian Paul Schmidt
 kojn
 Kristian "morfar" Johansson
 kuniuthefrogg
@@ -123,7 +123,6 @@ Paul Scott
 PlasmaSheep
 Przemysław "atheros" Grzywacz
 Ruszkai "C.Brutail" Ákos
-Samual Lenks
 Sc0rp
 Severin "sev" Meyer
 SoulKeeper_p