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: 7063233 1b8067f)

author	terencehill <piuntn@gmail.com>
	Thu, 5 Jan 2012 20:10:59 +0000 (21:10 +0100)
committer	terencehill <piuntn@gmail.com>
	Thu, 5 Jan 2012 20:10:59 +0000 (21:10 +0100)
commit	6e0ac89b3f58dbf7d1b0edc7e62968b5841ee59c
tree	5148118e44a4e40508371587ed4abd3a8fc8fc4e	tree \| snapshot
parent	7063233875c5c0612887ca7b231d4129e4a2aa7c	commit \| diff
parent	1b8067ffcc792adb987ffdd1a94a9cd834882c7b	commit \| diff

Merge branch 'master' into terencehill/itemstime

_hud_descriptions.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.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