Merge branch 'master' into terencehill/crosshair_fix
authorterencehill <piuntn@gmail.com>
Mon, 1 Nov 2010 13:35:46 +0000 (14:35 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 1 Nov 2010 13:35:46 +0000 (14:35 +0100)
commitaa3becb7d6b63184cf4c64416b598be242cae239
treeaf2d74d36be694e2f468f5277351ab3530b08606
parent6ac92d930bc3ba23d4deeccaebe1cdd359d770d2
parentf5a4528333fce47088f426c7fe76e1b913202860
Merge branch 'master' into terencehill/crosshair_fix

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