]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: e016414 c1819b6)
Merge branch 'fruitiex/better_shownames' into terencehill/newpanelhud
authorFruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 13:38:02 +0000 (16:38 +0300)
committerFruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 13:38:02 +0000 (16:38 +0300)
commit28e574de4fbb3760e35fe59aa1fb53c1066ff0c9
treef3e51fea7ebc55e389d340cb0375e2feb04601c6tree | snapshot
parente01641494f086ce4cca010d7b7dbf5a988638c3fcommit | diff
parentc1819b67892ba8f3d40f08d6bcfceda009188674commit | diff
Merge branch 'fruitiex/better_shownames' into terencehill/newpanelhud

Conflicts:
_hud_descriptions.cfg
defaultXonotic.cfg
hud_luminos.cfg
hud_luminos_minimal.cfg
hud_luminos_xhair_minimal.cfg
hud_nexuiz.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud.qc
qcsrc/client/hud.qh
qcsrc/common/constants.qh
qcsrc/common/util.qh
qcsrc/menu/xonotic/mainwindow.c
14 files changed:
_hud_descriptions.cfg diff1 | diff2 | blob | history
defaultXonotic.cfg diff1 | diff2 | blob | history
hud_luminos.cfg diff1 | diff2 | blob | history
hud_luminos_xhair_minimal.cfg diff1 | diff2 | blob | history
hud_nexuiz.cfg diff1 | diff2 | blob | history
qcsrc/client/Defs.qc diff1 | diff2 | blob | history
qcsrc/client/Main.qc diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh diff1 | diff2 | blob | history
qcsrc/client/hud.qc diff1 | diff2 | blob | history
qcsrc/client/hud.qh diff1 | diff2 | blob | history
qcsrc/common/constants.qh diff1 | diff2 | blob | history
qcsrc/common/util.qh diff1 | diff2 | blob | history
qcsrc/menu/classes.c diff1 | diff2 | blob | history
qcsrc/menu/xonotic/mainwindow.c diff1 | diff2 | blob | history