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: 8b1ab87 a343ce0)

author	Samual <samual@xonotic.org>
	Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
committer	Samual <samual@xonotic.org>
	Thu, 29 Dec 2011 15:16:04 +0000 (10:16 -0500)
commit	24f6d013a268851d6584e3f76ac0c0308f737b6f
tree	231fd712f51d860c2dacb3e2ec87cdcf628c5ce1	tree \| snapshot
parent	8b1ab877875ae26e00be88798f9d131dd8e9f601	commit \| diff
parent	a343ce0ad217507040ef083c89b7e07a2b01f917	commit \| diff

Merge remote branch 'origin/master' into samual/updatecommands

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/scoreboard.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.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
qcsrc/server/sv_main.qc	diff1 \|	diff2 \|	blob \| history