From: Jay Dolan Date: Mon, 21 Dec 2015 00:49:37 +0000 (+0000) Subject: Merge branch 'master' into 'master' X-Git-Tag: xonotic-v0.8.2~19^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=036f3f653150dc10d8dd998567f1d6d9a1ce57ee;p=xonotic%2Fnetradiant.git Merge branch 'master' into 'master' Fix crash on launch on OS X. Also describe installing deps with homebrew. Hi, I applied this patch to fix the crash after the initial game selection dialog: https://github.com/TTimo/GtkRadiant/issues/289 Also made a small update to COMPILING describing how you can build using dependencies installed with Homebrew. See merge request !1 --- 036f3f653150dc10d8dd998567f1d6d9a1ce57ee