From: Mario <zacjardine@y7mail.com>
Date: Sun, 8 Feb 2015 15:22:12 +0000 (+0000)
Subject: Merge branch 'terencehill/menu_fix' into 'master'
X-Git-Tag: xonotic-v0.8.1~122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=50c1071c99da4545ef285968205752f1c94ed258;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/menu_fix' into 'master'

Terencehill/menu fix

Fix for bug #1453 "Advanced settings dialog does not close after pressing OK"

See merge request !107
---

50c1071c99da4545ef285968205752f1c94ed258