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: c7963d8 3904f03)

author	terencehill <piuntn@gmail.com>
	Fri, 31 Dec 2010 11:27:18 +0000 (12:27 +0100)
committer	terencehill <piuntn@gmail.com>
	Fri, 31 Dec 2010 11:27:18 +0000 (12:27 +0100)
commit	81fd06082f4878a126140befaa404427b264724b
tree	2af4410997867a1f3a5d0fd7deab8dc0a1a31e15	tree \| snapshot
parent	c7963d830f81ac976fd10bd23812cfa24474e007	commit \| diff
parent	3904f036ddcd58908b78e34a37823c0c4f8510d9	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Defs.qc	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/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history