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)
commit5c261e6c8b328196282545db4b6d1b85df2a12d5
treed419995e32537efdd437fcea64ebfff75d51be88
parent462fb0d15ac82016069125aa004d73178504c97a
parent32cea895660be3d2051cd4e9f3d5d67b77709d3a
Merge remote branch 'origin/terencehill/minstagib_outofammo'
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/w_minstanex.qc