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

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

author	terencehill <piuntn@gmail.com>
	Sun, 4 Dec 2011 15:22:01 +0000 (16:22 +0100)
committer	terencehill <piuntn@gmail.com>
	Sun, 4 Dec 2011 15:22:01 +0000 (16:22 +0100)
commit	e8c79ab816cecd061eec17f29d0b164bcfe7b22b
tree	d7db4db1688b8f33d4264cfffc414e7fc7b37d05	tree \| snapshot
parent	aafa0916c3efdaec615d9fe4c9ab3dc21f350c2f	commit \| diff
parent	96d653c418485a1d27107dba9407b57a3d02e9fc	commit \| diff

Merge branch 'master' into terencehill/quickmenu