]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/fix_fragmessage_coloring'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:50:12 +0000 (20:50 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:50:12 +0000 (20:50 +0200)
1  2 
qcsrc/client/hud.qc

Simple merge