Merge branch 'master' into divVerent/virtual-mirror-damage
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Dec 2010 13:30:43 +0000 (14:30 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Dec 2010 13:30:43 +0000 (14:30 +0100)
commit72ab0540e65d8296d4d62c056f099c82bb815868
treeedbaa12640aefca2116aeeaa9fcac0c1f8c83145
parent42a0c75587c88d249f5795154dd9f7781e66063d
parent2cb097ba5d827791c0766cdd699dba9826fbdf91
Merge branch 'master' into divVerent/virtual-mirror-damage
qcsrc/menu/xonotic/dialog_multiplayer_create_advanced.c