]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 12 Nov 2010 22:19:23 +0000 (23:19 +0100)
commit4598f224d52aa8485c3ae0ecd40a12bc2cfbf8c8
treed9eb661155717656a8af42648da6f03ffb63d8c5
parente95ef7f12c33a0537860f97a990b1c6ec7870660
parentea2bf33373f52c67a94bd1ba8ad6a39c1da800be
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc