Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:20:06 +0000 (07:20 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:20:06 +0000 (07:20 +0100)
commita7791fa9daed4ce0f7fd73811eeb49e50094b2c7
tree18f2b3152f46359aabe87b515679b20a8b48a7d1
parent733dde459e637df729a9c9d7fa2e0641b2160317
parent472f639e84920c82603935ca708207e4729f0a34
Merge remote branch 'origin/fruitiex/fruit_vs_tzork-balance'
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc