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: fb45b79 11c51a5)

author	Mario <mario.mario@y7mail.com>
	Tue, 10 Sep 2013 01:18:14 +0000 (11:18 +1000)
committer	Mario <mario.mario@y7mail.com>
	Tue, 10 Sep 2013 01:18:14 +0000 (11:18 +1000)
commit	c092ab283a53142d3c9658bab30ec38e21e44f8c
tree	e8ff2f5d685eaf1659f64e0416beec5d531409ce	tree \| snapshot
parent	fb45b79ac9c90aec1fc28b009d3c164a1c43dc39	commit \| diff
parent	11c51a564e21f5f74ec7da33847cea4696b4f502	commit \| diff

Merge branch 'master' into Mario/quickmenu_merge

17 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/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/command/cl_cmd.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud_config.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history