From: Rudolf Polzer Date: Thu, 17 Jun 2010 07:38:43 +0000 (+0200) Subject: Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_s... X-Git-Tag: xonotic-v0.1.0preview~541^2~23^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=902b6412e307e9208c0bf70dc4f8f20697180b8c;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_stable Conflicts: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c --- 902b6412e307e9208c0bf70dc4f8f20697180b8c