Merge branch 'fruitiex/nexrun'
authorfruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 13 Feb 2010 14:31:34 +0000 (14:31 +0000)
committerfruitiex <fruitiex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 13 Feb 2010 14:31:34 +0000 (14:31 +0000)
commit45e0065e477c93bfe5351b5bb5428d52a165f47c
tree330fd0620697d5e1b4d74c6d57999ff1c9132628
parentf493bc0fbf76a876413809720d1f3f6377481790
Merge branch 'fruitiex/nexrun'

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8642 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
data/defaultNexuiz.cfg
data/qcsrc/common/gamecommand.qc
data/qcsrc/common/util.qh
data/qcsrc/server/clientcommands.qc
data/qcsrc/server/g_world.qc
data/qcsrc/server/gamecommand.qc
data/qcsrc/server/miscfunctions.qc