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

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	terencehill <piuntn@gmail.com>
	Sun, 6 Feb 2011 13:55:22 +0000 (14:55 +0100)
committer	terencehill <piuntn@gmail.com>
	Sun, 6 Feb 2011 13:55:22 +0000 (14:55 +0100)
commit	4b4b6c76692addb11d90abe169549afc99c2b682
tree	aaa5f3034bcac65c68554ced43f078d64a049e74	tree \| snapshot
parent	6313c5e5406277bcd2823d07d18137309824cf47	commit \| diff
parent	1a9a20d9faf56d6294f6aa169cef9e7f9a8be562	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

Conflicts:
qcsrc/client/hud.qc