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, 3 Apr 2011 21:15:52 +0000 (23:15 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 3 Apr 2011 21:15:52 +0000 (23:15 +0200)
commit	03d780d293d208d7b24c452d0e03ca4b12206413
tree	3300950d72065b6318bba996c6416ea924860bf2	tree \| snapshot
parent	206d65649e8a9d5c66a984d032d11043814b15b2	commit \| diff
parent	27487ee924a36d77232b3037a438932743ad546b	commit \| diff

Merge branch 'master' into terencehill/newpanelhud

Conflicts:
hud_luminos.cfg