Merge branch 'master' into fruitiex/gamemode_freezetag

author Rudolf Polzer <divverent@alientrap.org>

Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)

committer Rudolf Polzer <divverent@alientrap.org>

Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
author Rudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
committer Rudolf Polzer <divverent@alientrap.org>
Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/common/util.qc
Simple merge
diff --cc qcsrc/server/cl_physics.qc
Simple merge
author	Rudolf Polzer <divverent@alientrap.org>
	Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
committer	Rudolf Polzer <divverent@alientrap.org>
	Tue, 16 Nov 2010 21:11:13 +0000 (22:11 +0100)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_physics.qc	patch \|	diff1 \|	diff2 \|	blob \| history