From: Rudolf Polzer <divverent@gmail.com>
Date: Tue, 23 Dec 2014 21:47:58 +0000 (+0000)
Subject: Merge branch 'sev/xolonium' into 'master'
X-Git-Tag: xonotic-v0.8.0~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2f2b7e1d25627f0a2a8e8d73b9db7fd15c451ae;p=xonotic%2Fxonotic.git

Merge branch 'sev/xolonium' into 'master'

Xolonium font update

Since Xolonium version 2.0 (current master), I've added various pictographs and emoticons to the font,
to provide a Unicode compatible replacement of the legacy special characters.

Note:
I'm currently working on version 3.0 of Xolonium, which is a major (and hopefully final) revision.
However, it might not be ready for Xonotic 0.8. Hence I've pushed the preliminary version 2.4, which
includes up-to-date changes to the pictograph assignments.

See merge request !6
---

c2f2b7e1d25627f0a2a8e8d73b9db7fd15c451ae