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 2ab88504631d1e69e13c1c9d42b1563f63fe11df..bdf9aaf106f4b1e8d4df4559146cda21a7c93565 100755 (executable)
--- 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 <sev.ch@web.de>
-
-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 <sev.ch@web.de>
+
+
+This is a special GPL version of the Xolonium font,
+intended for Xonotic. Find the public release at
+<http://openfontlibrary.org/font/xolonium>
+
+
+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 <http://www.gnu.org/licenses/>.
+
+
+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 eecc4934ba493a6066aaca34a02d856a109573bb..2676016806c1cf0ddceae99b80cf1ea4d92f9224 100644 (file)
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 8ee1b4cdb7b03429161f3c87cf3dba5d58dbf619..18b1c5e9e45427d947f389c4277908e2d3d6c543 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ