Merge branch 'master' of git://github.com/spesmilo/electrum

2015-10-30 15:45:23 +01:00
parent 728ef1f76c d14f96ae79
commit c19c314c0f
2 changed files with 12 additions and 5 deletions
--- a/gui/kivy/uix/ui_screens/amount.kv
+++ b/gui/kivy/uix/ui_screens/amount.kv
@@ -66,6 +66,7 @@ Popup:
                    text: '<'
                    label: a
                Button:
+                    id: but_max
                    size_hint: 1, None
                    height: '48dp'
                    text: 'Max'
@@ -84,4 +85,3 @@ Popup:
                    height: '48dp'
                    text: _('OK')
                    on_release: popup.dismiss()
-