Merge branch 'master' into sev/xolonium

Conflicts:
	data/font-xolonium.pk3dir/font-xolonium.cfg

diff --git a/data/font-xolonium.pk3dir/font-xolonium.cfg b/data/font-xolonium.pk3dir/font-xolonium.cfg
index 023b64ea0078b34d5c5ddb7c6f646fe38c322a7a..f529defdb67f4cc75e5b9327f017885b8d13f00e 100644 (file)
--- a/data/font-xolonium.pk3dir/font-xolonium.cfg
+++ b/data/font-xolonium.pk3dir/font-xolonium.cfg
@@ -1,6 +1,6 @@
 // must be loaded AFTER config.cfg
 set menu_font_cfg font-xolonium.cfg
-loadfont console fonts/unifont-5.1.20080907,gfx/vera-sans $con_textsize
+loadfont console fonts/unifont-5.1.20080907,fonts/xolonium-regular.otf,gfx/vera-sans $con_textsize
 loadfont notify fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_notifysize
 loadfont chat fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans $con_chatsize
 loadfont centerprint fonts/xolonium-regular.otf,fonts/unifont-5.1.20080907,gfx/vera-sans 9

diff --git a/data/font-xolonium.pk3dir/fonts/README b/data/font-xolonium.pk3dir/fonts/README
old mode 100644 (file)
new mode 100755 (executable)
index 49f9141..2ab8850
--- a/data/font-xolonium.pk3dir/fonts/README
+++ b/data/font-xolonium.pk3dir/fonts/README
@@ -1,25 +1,22 @@
 Xolonium Font
-Copyright (C) 2011-2012 Severin Meyer <sev.ch@web.de>
+Copyright (C) 2011-2014 Severin Meyer <sev.ch@web.de>
 
-This font is free software: you can redistribute it 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
-(at your option) any later version.
+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.
+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.
+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/>.

diff --git a/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf b/data/font-xolonium.pk3dir/fonts/xolonium-bold.otf
index 6363dbd01cb8e03c55d6340645cbd64ef2a0fa96..eecc4934ba493a6066aaca34a02d856a109573bb 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 11241c2d89c14906584bff10dc6cd0e7517a0846..8ee1b4cdb7b03429161f3c87cf3dba5d58dbf619 100644 (file)
Binary files a/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf and b/data/font-xolonium.pk3dir/fonts/xolonium-regular.otf differ