]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 12 May 2011 20:14:28 +0000 (22:14 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 12 May 2011 20:14:28 +0000 (22:14 +0200)
commitc52282ec6b0a0e7e0a2c0f4ba634b4fac47f4c2f
treeee9dbbc22e24f1c4015bd7f9a553bc6db086697c
parent12acc195c49bdaee9e4a5319ed4842d3cca918af
parente2daf8d138855a357293af335c1406ac2f808870
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/main.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh