Merge jv
authorMerge Script
Thu, 02 Jun 2016 06:51:52 +0200
branchjv
changeset 16646 a5f135955d71
parent 16643 9fcec4cdfc7e (current diff)
parent 16645 bd1b6aa81dff (diff)
child 16664 ef51c9c52b52
Merge
AbstractSettingsApplication.st
SettingsDialog.st
--- a/AbstractSettingsApplication.st	Wed Jun 01 07:00:05 2016 +0200
+++ b/AbstractSettingsApplication.st	Thu Jun 02 06:51:52 2016 +0200
@@ -6524,7 +6524,7 @@
     function := self selectedFunctionKey value asSymbol.
 
     function = (resources string:'* unassigned *') ifTrue:[
-        mappings removekey:rawKey
+        mappings removeKey:rawKey
     ] ifFalse:[
         mappings at:rawKey put:function.
     ].
--- a/SettingsDialog.st	Wed Jun 01 07:00:05 2016 +0200
+++ b/SettingsDialog.st	Thu Jun 02 06:51:52 2016 +0200
@@ -1636,6 +1636,7 @@
         item application:app.
         app settingsDialog:self.
         app basicInitialize.
+        app createBuilder.
     ].
     self withWaitCursorDo:[
         app settingsDialog:self.