From: unknown <samual@xonotic.org>
Date: Wed, 17 Nov 2010 16:33:53 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/keepaway
X-Git-Tag: xonotic-v0.1.0preview~86^2~2^2~1^2~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=907d48e5db2bd5fda1d271ce05aa91ce1f3d47ba;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/keepaway
---

907d48e5db2bd5fda1d271ce05aa91ce1f3d47ba
diff --cc qcsrc/common/util.qc
index 8c87b7fda,8c87b7fda..823709c95
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -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";
  }