]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:44:52 +0000 (13:44 +0300)
committerFruitieX <fruitiex@gmail.com>
Sun, 1 May 2011 10:44:52 +0000 (13:44 +0300)
commit01bfb087092f257025957a55535b777634a31790
tree577b3314df8fe8ca4f380a95184713d9d5f620d4
parentd08048788ea59b6c5f425ca720dc99ac0a41663b
parentef44c5f1fc1dd00a4f07f7cfcc35f6cd07c44e10
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud

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