]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/scoreboard_update
authorterencehill <piuntn@gmail.com>
Thu, 8 Sep 2016 15:31:03 +0000 (17:31 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 8 Sep 2016 15:31:03 +0000 (17:31 +0200)
1  2 
qcsrc/client/hud/panel/scoreboard.qc

Simple merge