Merge remote-tracking branch 'origin/terencehill/cmd_fixes'
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:52:52 +0000 (16:52 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:52:52 +0000 (16:52 -0500)
commit64b6c7420b3e1c307f408a9f17d9c765a268621a
tree20184608a9478b1d84eebc0d7b58014d8eed3b77
parentf879dea04474678d9a263cf5d8c127415e390ca5
parent3618a0f2000f064d6f59b99c7b79d7a3c25f77b9
Merge remote-tracking branch 'origin/terencehill/cmd_fixes'

Conflicts:
qcsrc/client/scoreboard.qc
qcsrc/server/g_world.qc
qcsrc/client/command/cl_cmd.qc
qcsrc/client/scoreboard.qc
qcsrc/common/util.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc