git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fbcbf08 e55b0af)

author	terencehill <piuntn@gmail.com>
	Sat, 26 May 2012 12:50:02 +0000 (14:50 +0200)
committer	terencehill <piuntn@gmail.com>
	Sat, 26 May 2012 12:50:02 +0000 (14:50 +0200)
commit	41e9b002169cd742d5eadd4c540f55164af7f120
tree	d4d0b454f49c2db45120825a8b4798c90899908d	tree \| snapshot
parent	fbcbf08f083a9ab14b947849342f495f05ac9b56	commit \| diff
parent	e55b0af41ff296efc886dfaccf3f663f751f6502	commit \| diff

Merge branch 'master' into terencehill/itemstime

Conflicts:
qcsrc/client/hud.qc
qcsrc/menu/xonotic/mainwindow.c
qcsrc/server/t_items.qc

19 files changed:

_hud_common.cfg	diff1 \|	diff2 \|	blob \| history
_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal_xhair.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_old.cfg	diff1 \|	diff2 \|	blob \| history
hud_nexuiz.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	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
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history