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

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

author	Rudolf Polzer <divverent@alientrap.org>
	Thu, 6 May 2010 18:02:12 +0000 (20:02 +0200)
committer	Rudolf Polzer <divverent@alientrap.org>
	Thu, 6 May 2010 18:02:12 +0000 (20:02 +0200)
commit	44980a65baf9b6a551b45de0834cb1f235398052
tree	bc888125b6c0186659039c6d70e5391582d46f99	tree \| snapshot
parent	ac92712d44f753323e53f7196525a3b0786b5ce3	commit \| diff
parent	e5e1b555a29d1ab65757c57536372c2609883d33	commit \| diff

Merge commit 'origin/fruitiex/newpanelhud'

Conflicts:
qcsrc/client/sbar.qc