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)
1  2 
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge