From: Mario <zacjardine@y7mail.com>
Date: Sun, 2 Aug 2015 13:02:22 +0000 (+0000)
Subject: Merge branch 'sev/xolonium3' into 'master'
X-Git-Tag: xonotic-v0.8.1~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=737b6e2b75fae9b158cfb064d71a980be1c3004d;p=xonotic%2Fxonotic.git

Merge branch 'sev/xolonium3' into 'master'

Update Xolonium font to version 3.1

This merge request accompanies xonotic/xonotic-data.pk3dir!144

Also see http://forums.xonotic.org/showthread.php?tid=5466

See merge request !11
---

737b6e2b75fae9b158cfb064d71a980be1c3004d