]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Tue, 4 Jan 2011 20:29:58 +0000 (21:29 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 4 Jan 2011 20:29:58 +0000 (21:29 +0100)
commitf51d925a0faf39beb5debb7daefdf6c519e61cb3
tree84b9fc225930e2f3574031a00ae7d10ad4596020
parentadd5ad70562273e00c318f7615d76b7840191f2d
parentd334d3e656d3bfcb70b66c11291a224e6a8645d4
Merge branch 'master' into terencehill/newpanelhud
qcsrc/client/View.qc