changeset 2694:40c919cc4f28

Merge with remote changes.
author Augustin Preda
date Fri, 28 Mar 2014 00:33:23 +0200
parents d964db0e220d (current diff) d804c37df847 (diff)
children 29a269dc5fd3
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/share/resources/gui_0.8/fonts/SWB-L.font	Fri Mar 28 00:32:47 2014 +0200
+++ b/share/resources/gui_0.8/fonts/SWB-L.font	Fri Mar 28 00:33:23 2014 +0200
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" name="SWB-L" filename="IMFeGPsc29P.ttf" type="FreeType" size="12" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
+<Font version="3" name="SWB-L" filename="IMFeGPsc29P.ttf" type="FreeType" size="15" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
--- a/share/resources/gui_0.8/fonts/SWB-M.font	Fri Mar 28 00:32:47 2014 +0200
+++ b/share/resources/gui_0.8/fonts/SWB-M.font	Fri Mar 28 00:33:23 2014 +0200
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" name="SWB-M" filename="IMFeENrm29P.ttf" type="FreeType" size="10" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
+<Font version="3" name="SWB-M" filename="IMFeENrm29P.ttf" type="FreeType" size="13" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
--- a/share/resources/gui_0.8/fonts/SWB-S.font	Fri Mar 28 00:32:47 2014 +0200
+++ b/share/resources/gui_0.8/fonts/SWB-S.font	Fri Mar 28 00:33:23 2014 +0200
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" name="SWB-S" filename="IMFeENrm29P.ttf" type="FreeType" size="9" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
+<Font version="3" name="SWB-S" filename="IMFeENrm29P.ttf" type="FreeType" size="12" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
--- a/share/resources/gui_0.8/fonts/SWB-XL.font	Fri Mar 28 00:32:47 2014 +0200
+++ b/share/resources/gui_0.8/fonts/SWB-XL.font	Fri Mar 28 00:33:23 2014 +0200
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" name="SWB-XL" filename="IMFeENrm29P.ttf" type="FreeType" size="14" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
+<Font version="3" name="SWB-XL" filename="IMFeENrm29P.ttf" type="FreeType" size="18" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
--- a/share/resources/gui_0.8/fonts/SWB-XS.font	Fri Mar 28 00:32:47 2014 +0200
+++ b/share/resources/gui_0.8/fonts/SWB-XS.font	Fri Mar 28 00:33:23 2014 +0200
@@ -1,2 +1,2 @@
 <?xml version="1.0" ?>
-<Font version="3" name="SWB-XS" filename="IMFeENrm29P.ttf" type="FreeType" size="8" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>
+<Font version="3" name="SWB-XS" filename="IMFeENrm29P.ttf" type="FreeType" size="10" nativeHorzRes="1920" nativeVertRes="1080" autoScaled="vertical"/>