Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)
committerunknown <samual@xonotic.org>
Wed, 17 Nov 2010 16:33:53 +0000 (11:33 -0500)
1  2 
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.c

Simple merge
@@@ -439,6 -439,6 +439,7 @@@ string GametypeNameFromType(float g
        else if (g == GAME_RACE) return "rc";
        else if (g == GAME_NEXBALL) return "nexball";
        else if (g == GAME_CTS) return "cts";
++      else if (g == GAME_KEEPAWAY) return "ka";
        return "dm";
  }