From: Severin Meyer Date: Thu, 9 Jul 2015 08:52:25 +0000 (+0200) Subject: Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3 X-Git-Tag: xonotic-v0.8.1~5^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1fcbaeaaa02677e4f0e04d946064645eee651f76;hp=97c6fdd825aae064575e394db308d8ceed22fefb Merge branch 'master' of gitlab.com:xonotic/xonotic into sev/xolonium3 --- diff --git a/data/font-xolonium.pk3dir/fonts/README b/data/font-xolonium.pk3dir/fonts/README index 2ab88504..bdf9aaf1 100755 --- a/data/font-xolonium.pk3dir/fonts/README +++ b/data/font-xolonium.pk3dir/fonts/README @@ -1,22 +1,32 @@ -Xolonium Font -Copyright (C) 2011-2014 Severin Meyer - -This font is free software. You can use, modify and/or redistribute it -under the terms of the GNU General Public License as published by the Free -Software Foundation, either version 2 of the license, or any later version. - -As a special exception, if you create a document which uses this font, -and embed this font or unaltered portions of this font into the document, -this font does not by itself cause the resulting document to be covered by -the GNU General Public License. This exception does not however invalidate -any other reasons why the document might be covered by the GNU General -Public License. If you modify this font, you may extend this exception -to your version of the font, but you are not obligated to do so. If you -do not wish to do so, delete this exception statement from your version. - -This font is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. See the GNU General Public License for more details. +Copyright 2011-2015 Severin Meyer + + +This is a special GPL version of the Xolonium font, +intended for Xonotic. Find the public release at + + + +This font is free software. You can redistribute and/or +modify it under the terms of the GNU General Public +License as published by the Free Software Foundation, +either version 2 of the license, or any later version. + +This font is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty +of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this font. If not, see . + + +As a special exception, if you create a document which uses this +font, and embed this font or unaltered portions of this font into +the document, this font does not by itself cause the resulting +document to be covered by the GNU General Public License. + +This exception does not however invalidate any other reasons why +the document might be covered by the GNU General Public License. +If you modify this font, you may extend this exception to your +version of the font, but you are not obligated to do so. If you do +not wish to do so, delete this exception statement from your version. diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf index eecc4934..26760168 100644 Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf differ diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf index 8ee1b4cd..18b1c5e9 100644 Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ