]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/terencehill/observer_color', fixes #1444
authorRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:16:54 +0000 (17:16 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:17:01 +0000 (17:17 +0100)
1  2 
qcsrc/client/hud.qc

Simple merge