From: Rudolf Polzer <divverent@gmail.com>
Date: Sun, 11 Jan 2015 16:22:12 +0000 (+0000)
Subject: Merge branch 'terencehill/teams_override_cvars' into 'master'
X-Git-Tag: xonotic-v0.8.0~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5c7eb4ebce0271e742eb850ad9b974a1540fef3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/teams_override_cvars' into 'master'

Terencehill/teams override cvars

Remove g_keepaway_teams_override from the menu as it doesn't exist anymore

See merge request !73
---

b5c7eb4ebce0271e742eb850ad9b974a1540fef3