Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3
authorSeverin Meyer <sev.ch@web.de>
Thu, 9 Jul 2015 08:52:25 +0000 (10:52 +0200)
committerSeverin Meyer <sev.ch@web.de>
Thu, 9 Jul 2015 08:52:25 +0000 (10:52 +0200)
commit1fcbaeaaa02677e4f0e04d946064645eee651f76
treeaffb86c92e3e9cf35cec5bd833b61efddd4f7fad
parent8f7dc42f2f0e75137fa2a98c63b1a889dd2efe22
parent97c6fdd825aae064575e394db308d8ceed22fefb
Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3