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

]> 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: 04454a6 d643a85)

author	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 2 Aug 2015 10:08:07 +0000 (20:08 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 2 Aug 2015 10:08:07 +0000 (20:08 +1000)
commit	f1a11cabe78baaaa067fe22bbdf2ca1546d1e8fc
tree	588e00fc3df33ebc2ed480ffaffda539e216e85b	tree \| snapshot
parent	04454a65df4d8c82bcfc8c8d392265538cd1b52f	commit \| diff
parent	d643a85365a46cde125ddcdc5834bbfee9dbc532	commit \| diff

Merge branch 'master' into terencehill/itemstime

# Conflicts:
# qcsrc/common/stats.qh

15 files changed:

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luma.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.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/stats.qh	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