]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit4f8faeffe1e93fc20750dd8d9af2c62b4541525c
treea36893233abcc831f8a6f7d4758ea88a97bcbfad
parent48400335f475b3503f4331a150e0b6431b8819ed
parent8f8c0b073966d40910193ca94af15528db56807d
Merge branch 'master' into terencehill/scoreboard_update
qcsrc/client/hud/panel/scoreboard.qc