Merge jv
authorMerge Script
Fri, 29 Apr 2016 06:55:43 +0200
branchjv
changeset 5684 96602925bf13
parent 5681 a67da23dde03 (current diff)
parent 5683 7027fccb78dd (diff)
child 5688 60766cc55bfd
Merge
ListView.st
--- a/ListView.st	Wed Apr 27 06:51:09 2016 +0200
+++ b/ListView.st	Fri Apr 29 06:55:43 2016 +0200
@@ -2539,7 +2539,7 @@
     nFullLinesShown := 1. "just any value ..."
     nLinesShown := 1.     "just any value"
     partialLines := true.
-    tabPositions := UserDefaultTabPositions ? DefaultTabPositions.
+    tabPositions := UserDefaultTabPositions ? self class defaultTabPositions.
     includesNonStrings := false.
     lineEndCRLF := false.    
     checkedLinesForWidthOfContentsComputation := nil."/ i.e. all
--- a/Workspace.st	Wed Apr 27 06:51:09 2016 +0200
+++ b/Workspace.st	Fri Apr 29 06:55:43 2016 +0200
@@ -1986,7 +1986,7 @@
         sub
             addItemList:#(
                 ('-'                                                                        )
-                ('Browse'                       browseIt                BrowseIt            )
+                ('Browse It'                    browseIt                BrowseIt            )
                 ('Browse Pool'                  browseSharedPoolOfIt                        )
                 ('Senders of It'                browseSendersOfIt                           )
                 ('Implementors of It'           browseImplementorsOfIt  ImplementorsOfIt    )