]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud-dom_points
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 20:17:04 +0000 (23:17 +0300)
commit0b2b94b02edc3a3af4a7eb7402fc0c46d506fd9b
tree5f319add6e53c5ba7254623ad0ecdb8a9220ce6d
parentfdc67cbf0d851e552928a729920dfc52c8fc9d73
parentf6f0432cc4fd27ffe796a6d42dd4ba53a829bc12
Merge branch 'master' into terencehill/newpanelhud-dom_points
defaultXonotic.cfg
qcsrc/client/hud.qc