Merge remote branch 'origin/master' into tzork/csqc-items

author Jakob MG <jakob_mg@hotmail.com>

Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)

committer Jakob MG <jakob_mg@hotmail.com>

Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
author Jakob MG <jakob_mg@hotmail.com>
Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
committer Jakob MG <jakob_mg@hotmail.com>
Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc qcsrc/server/t_items.qc
Simple merge
author	Jakob MG <jakob_mg@hotmail.com>
	Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
committer	Jakob MG <jakob_mg@hotmail.com>
	Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
		1	2
defaultXonotic.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	patch \|	diff1 \|	diff2 \|	blob \| history