git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit

author	Rudolf Polzer <divverent@xonotic.org>
	Sat, 13 Jul 2013 09:30:46 +0000 (11:30 +0200)
committer	Rudolf Polzer <divverent@xonotic.org>
	Sat, 13 Jul 2013 09:30:46 +0000 (11:30 +0200)
commit	bca6f1c2535abc41b7bdf22d08257d438dd0e3f0
tree	aba4662b5d97232e7aac6fe3d552dae9c72eef48	tree \| snapshot
parent	47cc2cc72684600e434a8ee2e7f4685d54d9fa39	commit \| diff
parent	a2210a953016798b2e06aa10e45f13fb358788af	commit \| diff

Merge branch 'master' into divVerent/anticheat-tricks