Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_s...
authorRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:38:43 +0000 (09:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 17 Jun 2010 07:38:43 +0000 (09:38 +0200)
Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c

1  2 
qcsrc/menu/menu.qc

Simple merge