]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sun, 1 May 2011 16:49:41 +0000 (18:49 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 1 May 2011 16:49:41 +0000 (18:49 +0200)
commit6ace6194875c750e6ac26b2f9353d259845aa4fd
tree3852ce987445a2db291eacd6fbf935867263684e
parent30fb0c40b9d3e79978916460107efbd64352b743
parentef44c5f1fc1dd00a4f07f7cfcc35f6cd07c44e10
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
13 files changed:
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/domination.qc
qcsrc/server/miscfunctions.qc