Merge branch 'master' into 'master'
authorRudolf Polzer <divverent@gmail.com>
Mon, 21 Dec 2015 15:09:58 +0000 (15:09 +0000)
committerRudolf Polzer <divverent@gmail.com>
Mon, 21 Dec 2015 15:09:58 +0000 (15:09 +0000)
commit15db7a5ac71bab779fea106e5a6578592abd2594
tree04dfaa1943857e98474bedbed4ea780ec2ac85c0
parentc51c744b5ff06a6553a23914c274d6a2911c8eda
parent036f3f653150dc10d8dd998567f1d6d9a1ce57ee
Merge branch 'master' into 'master'

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

See merge request !16