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)
commit902b6412e307e9208c0bf70dc4f8f20697180b8c
treece9fdb195c4cf8d0e5812b8b46b5135ae15dc2b9
parent6d81ab64afd3d9980ff963edb261c03554fdfddb
parentde52b3d61a7f7212fed9eabc1478843c4bf1e11e
Merge remote branch 'origin/divVerent/menu-imprOOvements' into fruitiex/newpanelhud_stable

Conflicts:
qcsrc/menu/xonotic/dialog_multiplayer_playersetup_radar.c
qcsrc/menu/menu.qc