Merge remote branch 'origin/akari/healthcross'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Feb 2011 09:39:23 +0000 (10:39 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Feb 2011 09:39:23 +0000 (10:39 +0100)
commita2aac26e6d660e5e70e65d7639a669bced3de9e2
tree0c6580e8749329b8835fb4687d65149b4e1598d9
parent613b4480f70d42c4a02dbad125561db02f61f815
parent85e22c4bed4589e0b5919085688e82559f3e0d55
Merge remote branch 'origin/akari/healthcross'

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c