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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/item/nexposee.qc

author	terencehill <piuntn@gmail.com>
	Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
committer	terencehill <piuntn@gmail.com>
	Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
commit	bb80a6aba067167c6ef8d5f3465f03bd34142fa2
tree	359d8e31eab76485934be212491197230787ae19	tree \| snapshot
parent	a035d049951445f892a37bfdef3e738f8a18e8b9	commit \| diff
parent	61c76972374b56c3df73abc2a71fe665fffc2212	commit \| diff

Merge branch 'master' into terencehill/weapon_panel_fix

Conflicts:
qcsrc/client/hud.qc