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: 66bf06d a8f17a6)

author	terencehill <piuntn@gmail.com>
	Sat, 26 Feb 2011 17:28:26 +0000 (18:28 +0100)
committer	terencehill <piuntn@gmail.com>
	Sat, 26 Feb 2011 17:28:26 +0000 (18:28 +0100)
commit	c5ebde8d94010d71635def61abf89f69fa892b15
tree	9e0529edb3ba4579d30e6f9fdb149f593f8f37e3	tree \| snapshot
parent	66bf06d8ca243f8730e4a003f0a367224899796b	commit \| diff
parent	a8f17a654113be7b43f1812c42156bdc9b335856	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

13 files changed:

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_minimal.cfg	diff1 \|	diff2 \|	blob \| history
hud_luminos_xhair_minimal.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/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.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