Merge remote-tracking branch 'origin/master' into fruitiex/better_shownames

author FruitieX <fruitiex@gmail.com>

Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)

committer FruitieX <fruitiex@gmail.com>

Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
author FruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
committer FruitieX <fruitiex@gmail.com>
Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
diff --cc _hud_descriptions.cfg
Simple merge
diff --cc defaultXonotic.cfg
Simple merge
diff --cc hud_luminos_xhair_minimal.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/cl_player.qc
Simple merge
author	FruitieX <fruitiex@gmail.com>
	Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
committer	FruitieX <fruitiex@gmail.com>
	Mon, 11 Apr 2011 12:08:13 +0000 (15:08 +0300)
		1	2
_hud_descriptions.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
hud_luminos_xhair_minimal.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	patch \|	diff1 \|	diff2 \|	blob \| history