Merge branch 'master' into divVerent/weapons-field-rewrite
authorRudolf Polzer <divverent@alientrap.org>
Sat, 31 Mar 2012 16:36:38 +0000 (18:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 31 Mar 2012 16:36:38 +0000 (18:36 +0200)
commit20194b24b0b3a019e53ce08ed100b78f79f5652b
tree1a9f8023c807c3f6d70ca107e1397e2b055c8aa4
parent57356786644b16c2a56f5127ba6fadd60aa8d742
parent6592a0bad06897e1365877198acac7d23e35776f
Merge branch 'master' into divVerent/weapons-field-rewrite

Conflicts:
qcsrc/server/t_items.qc
balanceXonotic.cfg
defaultXonotic.cfg
qcsrc/client/hud.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weapons.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc