Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon...
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:09:42 +0000 (19:09 -0400)
commitbd71e076bdb4066094634ee70e7cdce9b2fc4002
treebe118258ae5ba0900206695037b1685136919e68
parentb66021be8ecc46a24a5a80cf5dfabb395cab41f9
parentd6d9cfdafd8f5441bedf898d50e683ff976dae91
Merge remote-tracking branch 'origin/master' into terencehill/menu_weaponarena_weapon_selection
defaultXonotic.cfg
qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c