]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/scoreboard_integer_minutes'
authormand1nga <mand1nga@xonotic.org>
Sun, 24 Apr 2011 14:27:09 +0000 (11:27 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 24 Apr 2011 14:27:09 +0000 (11:27 -0300)
1  2 
qcsrc/client/scoreboard.qc

Simple merge