Merge remote branch 'origin/terencehill/minstagib_outofammo'
authorSamual <samual@xonotic.org>
Wed, 29 Feb 2012 19:42:42 +0000 (14:42 -0500)
committerSamual <samual@xonotic.org>
Wed, 29 Feb 2012 19:42:42 +0000 (14:42 -0500)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/w_minstanex.qc

Simple merge
Simple merge
Simple merge