Merge remote branch 'origin/master' into fruitiex/racefixes
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 15:42:55 +0000 (18:42 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 26 Oct 2010 15:42:55 +0000 (18:42 +0300)
commit4c1fcf7b3bdaee8fd10d48d2ac5b21c3a9371de1
treeffd57747883819516a3f3dc7ac0daf6e7488a115
parent8c1387ec331cf65c72e7f7f8ee8a10c716d7e41e
parent0ac1c629d686db49fe7b04700d358aa6588f74f8
Merge remote branch 'origin/master' into fruitiex/racefixes
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/clientcommands.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc