de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	Rudolf Polzer <divverent@xonotic.org>
	Tue, 29 Jan 2013 08:43:46 +0000 (09:43 +0100)
committer	Rudolf Polzer <divverent@xonotic.org>
	Tue, 29 Jan 2013 08:43:46 +0000 (09:43 +0100)
commit	24312dad229b4f8f5bfb9b2b87452f286361b3f9
tree	eca294504ddc32a23b13ef61329eea6003c1e526	tree \| snapshot
parent	d43b14d1e355a468d5f293d12d161276d086db7e	commit \| diff
parent	d8d184e7c633d17f6a4468627b690bdbbae62206	commit \| diff

Merge branch 'master' into divVerent/rank-change

Conflicts:
qcsrc/server/playerstats.qc