From: Rudolf Polzer <divverent@gmail.com>
Date: Mon, 21 Dec 2015 15:09:58 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: xonotic-v0.8.2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=15db7a5ac71bab779fea106e5a6578592abd2594;p=xonotic%2Fnetradiant.git

Merge branch 'master' into 'master'

Fix OS X segmentation fault (ericwa). Fix Quetoo game detection.



See merge request !16
---

15db7a5ac71bab779fea106e5a6578592abd2594