git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/mutators/base.qc

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/mutators/base.qc

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eae4c92 ad8f3ce)

author	Mario <mario.mario@y7mail.com>
	Fri, 20 Dec 2013 01:19:34 +0000 (12:19 +1100)
committer	Mario <mario.mario@y7mail.com>
	Fri, 20 Dec 2013 01:19:34 +0000 (12:19 +1100)
commit	1649a77da3e957dbc722f2eb3af636725bb00a81
tree	fbe53df4c2c4c9ddc7480d0685dce265675b52be	tree \| snapshot
parent	eae4c929db000c8a3649b366f04b111784db9158	commit \| diff
parent	ad8f3ce1398d7fa2204c0282b1d0f84838ca0e92	commit \| diff

Merge branch 'master' into Mario/showspecs

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