]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 27 Nov 2010 23:06:41 +0000 (00:06 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 27 Nov 2010 23:06:41 +0000 (00:06 +0100)
commita0f8261f12a1a8b073066e06622834cad1a06c65
tree344d1af4477026b82dfd14b8f00904060bb16c26
parentf189d02086aba6d4903c4a2128daf3ac36420447
parent64ddbee7cf616535317f0367feb3dc106cdaaa42
Merge branch 'master' into terencehill/newpanelhud
qcsrc/client/Main.qc
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/client/scoreboard.qc