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: edfb821 4893188)

author	terencehill <piuntn@gmail.com>
	Tue, 19 Mar 2013 16:34:21 +0000 (17:34 +0100)
committer	terencehill <piuntn@gmail.com>
	Tue, 19 Mar 2013 16:34:21 +0000 (17:34 +0100)
commit	b4af8be2abfa8caeceb2fc714c3effb09acf910d
tree	d218a36f1b26d591f380a3950a39ebe7d1f57fe3	tree \| snapshot
parent	edfb82123fa0867707f0efd2f2dd9e170263aa1b	commit \| diff
parent	489318817dc508e24f479090ddcf53ace10adbf0	commit \| diff

Merge branch 'master' into terencehill/quickmenu

Conflicts:
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

18 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/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/classes.c	diff1 \|	diff2 \|	blob \| history