From: Mario <zacjardine@y7mail.com>
Date: Wed, 5 Aug 2015 05:13:58 +0000 (+0000)
Subject: Merge branch 'sev/xolonium3' into 'master'
X-Git-Tag: xonotic-v0.8.1~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=cf2fdd17f4364417db13d5156e1a9edeb13855e8

Merge branch 'sev/xolonium3' into 'master'

Xolonium sourcefiles

The sourcefiles of the latest version of Xolonium.

See merge request !4
---

cf2fdd17f4364417db13d5156e1a9edeb13855e8