electrum

commit d5479b8dfca0d7ee20b0c0720d4c3087eae091cc
parent 307ec36d34c64f5454fb0d48b1cf29989fb09134
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 29 Jan 2016 11:08:50 +0100

Merge pull request #1658 from akshayaurora/move_fonts

kivy: move data/fonts into gui/kivy/data/fonts
Diffstat:
R
data/fonts/Roboto-Bold.ttf -> gui/kivy/data/fonts/Roboto-Bold.ttf
 | 
0

R
data/fonts/Roboto-Condensed.ttf -> gui/kivy/data/fonts/Roboto-Condensed.ttf
 | 
0

R
data/fonts/Roboto-Medium.ttf -> gui/kivy/data/fonts/Roboto-Medium.ttf
 | 
0

R
data/fonts/Roboto.ttf -> gui/kivy/data/fonts/Roboto.ttf
 | 
0

R
data/fonts/tron/License.txt -> gui/kivy/data/fonts/tron/License.txt
 | 
0

R
data/fonts/tron/Readme.txt -> gui/kivy/data/fonts/tron/Readme.txt
 | 
0

R
data/fonts/tron/Tr2n.ttf -> gui/kivy/data/fonts/tron/Tr2n.ttf
 | 
0

M
gui/kivy/main_window.py
 | 
8
++++----

8 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/fonts/Roboto-Bold.ttf b/gui/kivy/data/fonts/Roboto-Bold.ttf
Binary files differ.
diff --git a/data/fonts/Roboto-Condensed.ttf b/gui/kivy/data/fonts/Roboto-Condensed.ttf
Binary files differ.
diff --git a/data/fonts/Roboto-Medium.ttf b/gui/kivy/data/fonts/Roboto-Medium.ttf
Binary files differ.
diff --git a/data/fonts/Roboto.ttf b/gui/kivy/data/fonts/Roboto.ttf
Binary files differ.
diff --git a/data/fonts/tron/License.txt b/gui/kivy/data/fonts/tron/License.txt
diff --git a/data/fonts/tron/Readme.txt b/gui/kivy/data/fonts/tron/Readme.txt
diff --git a/data/fonts/tron/Tr2n.ttf b/gui/kivy/data/fonts/tron/Tr2n.ttf
Binary files differ.
diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py
@@ -296,10 +296,10 @@ class ElectrumWindow(App):
         # inside markup.
         from kivy.core.text import Label
         Label.register('Roboto',
-                   'data/fonts/Roboto.ttf',
-                   'data/fonts/Roboto.ttf',
-                   'data/fonts/Roboto-Bold.ttf',
-                   'data/fonts/Roboto-Bold.ttf')
+                   'gui/kivy/data/fonts/Roboto.ttf',
+                   'gui/kivy/data/fonts/Roboto.ttf',
+                   'gui/kivy/data/fonts/Roboto-Bold.ttf',
+                   'gui/kivy/data/fonts/Roboto-Bold.ttf')
 
         win.softinput_mode = 'below_target'