From: terencehill Date: Sat, 3 Oct 2015 20:47:15 +0000 (+0200) Subject: Merge branch 'master' into terencehill/tooltips_cleanup X-Git-Tag: xonotic-v0.8.2~1824^2~4 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32ca966802c45c4c231210c2d8776bc3f4135dc2;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/tooltips_cleanup --- 32ca966802c45c4c231210c2d8776bc3f4135dc2