Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jv
authorHG Automerge
Thu, 29 Dec 2016 00:19:01 +0000
branchjv
changeset 17219 46a5890e4c57
parent 17218 95008a0da101 (current diff)
parent 17200 a22082c4f728 (diff)
child 17220 324f16278da6
Merge
AbstractFileBrowser.st file | annotate | diff | comparison | revisions
DebugView.st file | annotate | diff | comparison | revisions
Make.proto file | annotate | diff | comparison | revisions
Make.spec file | annotate | diff | comparison | revisions
MultiViewToolApplication.st file | annotate | diff | comparison | revisions
Tools__CheckinInfoDialog.st file | annotate | diff | comparison | revisions
Tools__Inspector2.st file | annotate | diff | comparison | revisions
Tools__NewSystemBrowser.st file | annotate | diff | comparison | revisions
WorkspaceApplication.st file | annotate | diff | comparison | revisions
abbrev.stc file | annotate | diff | comparison | revisions
bc.mak file | annotate | diff | comparison | revisions
extensions.st file | annotate | diff | comparison | revisions
libInit.cc file | annotate | diff | comparison | revisions
stx_libtool.st file | annotate | diff | comparison | revisions 
--- a/AbstractFileBrowser.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/AbstractFileBrowser.st	Thu Dec 29 00:19:01 2016 +0000
@@ -1581,6 +1581,11 @@
             itemValue: doGotoSmalltalkDirectory
           )
          (MenuItem
+            enabled: enableGotoSmalltalkWorkspaceDirectory
+            label: 'Smalltalk Workspace Directory'
+            itemValue: doGotoSmalltalkWorkspaceDirectory
+          )
+         (MenuItem
             enabled: enableGotoTempDirectory
             label: 'Smalltalk Temp Directory'
             itemValue: doGotoTempDirectory
@@ -3599,6 +3604,10 @@
     ^ self aspectFor:#enableGotoSmalltalkDirectory ifAbsent:[ true asValue ].
 !
 
+enableGotoSmalltalkWorkspaceDirectory
+    ^ self aspectFor:#enableGotoSmalltalkWorkspaceDirectory ifAbsent:[ true asValue ].
+!
+
 enableGotoTempDirectory
     ^ self aspectFor:#enableGotoTempDirectory ifAbsent:[ true asValue ].
 
@@ -5550,6 +5559,10 @@
     self gotoFile:(self smalltalkDirectory).
 !
 
+doGotoSmalltalkWorkspaceDirectory
+    self gotoFile:(UserPreferences current workspaceDirectory).
+!
+
 doGotoTempDirectory
     self gotoFile:(self tempDirectory).
 
--- a/DebugView.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/DebugView.st	Thu Dec 29 00:19:01 2016 +0000
@@ -758,7 +758,24 @@
      Open debuggers exist when stepping only, as then, the debugger is left open until the step
      is reached, to avoid too much flickering and redrawing on the screen"
 
-    |active|
+    "
+     well, it could be a stepping or sending debugger up there;
+     in this case, return to it. This happens, when a stepping process
+     runs into an error (for example, a halt). In this case, we want the
+     stepping debugger to come up again instead of a new one.
+    "
+    OpenDebuggers notNil ifTrue:[
+        ^ self openDebuggerForProcess:(Processor activeProcess)
+    ].    
+    ^ nil
+
+    "Created: / 06-11-2013 / 20:57:49 / cg"
+!
+
+openDebuggerForProcess:aProcess
+    "if aProcess is being debugged and has an open debugger on it, 
+     then return it, or nil, if there is none.
+     Open debuggers also exist as unmapped windows when single-stepping"
 
     "
      well, it could be a stepping or sending debugger up there;
@@ -767,13 +784,12 @@
      stepping debugger to come up again instead of a new one.
     "
     OpenDebuggers notNil ifTrue:[
-        active := Processor activeProcess.
         OpenDebuggers do:[:aDebugger |
             |debuggersProcess|
 
             (aDebugger notNil and:[aDebugger ~~ 0]) ifTrue:[
                 debuggersProcess := aDebugger inspectedProcess.
-                debuggersProcess == active ifTrue:[
+                debuggersProcess == aProcess ifTrue:[
                     aDebugger device isOpen ifTrue:[
                         DebuggingDebugger == true ifTrue:[
                             'reusing cached debugger' errorPrintCR.
@@ -789,12 +805,10 @@
         ]
     ].
     ^ nil
-
-    "Created: / 06-11-2013 / 20:57:49 / cg"
 !
 
 openOn:aProcess
-    "start a  debugger on aProcess
+    "start a debugger on aProcess
      (actually not more than a good-looking inspector)"
 
     |aDebugger label nm|
--- a/Make.proto	Mon Dec 26 10:26:02 2016 +0000
+++ b/Make.proto	Thu Dec 29 00:19:01 2016 +0000
@@ -185,6 +185,7 @@
 $(OUTDIR)EventMonitor.$(O) EventMonitor.$(C) EventMonitor.$(H): EventMonitor.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowser.$(O) FileBrowser.$(C) FileBrowser.$(H): FileBrowser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/StandardSystemView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2PanelView.$(O) FileBrowserV2PanelView.$(C) FileBrowserV2PanelView.$(H): FileBrowserV2PanelView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libwidg/VariablePanel.$(H) $(STCHDR)
+$(OUTDIR)FileBrowserV2SettingsDialog.$(O) FileBrowserV2SettingsDialog.$(C) FileBrowserV2SettingsDialog.$(H): FileBrowserV2SettingsDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2UISpecifications.$(O) FileBrowserV2UISpecifications.$(C) FileBrowserV2UISpecifications.$(H): FileBrowserV2UISpecifications.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libui/ComponentSpec.$(H) $(INCLUDE_TOP)/stx/libui/UISpecification.$(H) $(INCLUDE_TOP)/stx/libui/VariablePanelSpec.$(H) $(INCLUDE_TOP)/stx/libui/ViewSpec.$(H) $(INCLUDE_TOP)/stx/libui/ViewWithSubcomponentsSpec.$(H) $(STCHDR)
 $(OUTDIR)FileDialog.$(O) FileDialog.$(C) FileDialog.$(H): FileDialog.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
 $(OUTDIR)FileOperation.$(O) FileOperation.$(C) FileOperation.$(H): FileOperation.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -196,6 +197,7 @@
 $(OUTDIR)MultiViewToolApplication.$(O) MultiViewToolApplication.$(C) MultiViewToolApplication.$(H): MultiViewToolApplication.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/ToolApplicationModel.$(H) $(STCHDR)
 $(OUTDIR)PerforceSourceCodeManagerUtilities.$(O) PerforceSourceCodeManagerUtilities.$(C) PerforceSourceCodeManagerUtilities.$(H): PerforceSourceCodeManagerUtilities.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/SimpleDialog.$(H) $(STCHDR)
 $(OUTDIR)ProcessMonitorV2.$(O) ProcessMonitorV2.$(C) ProcessMonitorV2.$(H): ProcessMonitorV2.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
+$(OUTDIR)RCSConflictEditTextView.$(O) RCSConflictEditTextView.$(C) RCSConflictEditTextView.$(H): RCSConflictEditTextView.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(STCHDR)
 $(OUTDIR)SyntaxElement.$(O) SyntaxElement.$(C) SyntaxElement.$(H): SyntaxElement.st $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)SyntaxHighlighter2.$(O) SyntaxHighlighter2.$(C) SyntaxHighlighter2.$(H): SyntaxHighlighter2.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libcomp/SyntaxHighlighter.$(H) $(STCHDR)
 $(OUTDIR)SystemBrowser.$(O) SystemBrowser.$(C) SystemBrowser.$(H): SystemBrowser.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
@@ -338,7 +340,7 @@
 $(OUTDIR)Tools__HierarchicalChangeList.$(O) Tools__HierarchicalChangeList.$(C) Tools__HierarchicalChangeList.$(H): Tools__HierarchicalChangeList.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserListWithFilter.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ChangeList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(C) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ProjectList.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libwidg2/AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItem.$(H) $(INCLUDE_TOP)/stx/libwidg2/HierarchicalItemWithLabel.$(H) $(STCHDR)
 $(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(C) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__BrowserList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__ClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)/stx/libtool/Tools__NavigatorModel.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/AbstractTime.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Autoload.$(H) $(INCLUDE_TOP)/stx/libbasic/Bag.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Block.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/Date.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalLibraryFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/FileStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Filename.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Geometric.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Interval.$(H) $(INCLUDE_TOP)/stx/libbasic/KeyedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/MethodDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Point.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Rectangle.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/SmallInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/Smalltalk.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/Time.$(H) $(INCLUDE_TOP)/stx/libbasic/Timestamp.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/Warning.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic2/Iterator.$(H) $(INCLUDE_TOP)/stx/libbasic2/RunArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SocketAddress.$(H) $(INCLUDE_TOP)/stx/libbasic2/Text.$(H) $(INCLUDE_TOP)/stx/libbasic2/UUID.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic3/ChangeSet.$(H) $(INCLUDE_TOP)/stx/libbasic3/CompositeChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ProfileTree.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Breakpoint.$(H) $(INCLUDE_TOP)/stx/libcomp/BreakpointDescription.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libview/Color.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/Form.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/Image.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/MultiImage.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/MenuView.$(H) $(INCLUDE_TOP)/stx/libwidg/PopUpMenu.$(H) $(INCLUDE_TOP)/stx/libwidg/SelectionInListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/AbstractTime.$(H) $(INCLUDE_TOP)/stx/libbasic/ArithmeticValue.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Autoload.$(H) $(INCLUDE_TOP)/stx/libbasic/Bag.$(H) $(INCLUDE_TOP)/stx/libbasic/Behavior.$(H) $(INCLUDE_TOP)/stx/libbasic/Block.$(H) $(INCLUDE_TOP)/stx/libbasic/Boolean.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Character.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Class.$(H) $(INCLUDE_TOP)/stx/libbasic/ClassDescription.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/CompiledCode.$(H) $(INCLUDE_TOP)/stx/libbasic/Date.$(H) $(INCLUDE_TOP)/stx/libbasic/Dictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/ExecutableFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalLibraryFunction.$(H) $(INCLUDE_TOP)/stx/libbasic/ExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/FileStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Filename.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/Geometric.$(H) $(INCLUDE_TOP)/stx/libbasic/IdentityDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/ImmutableArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Integer.$(H) $(INCLUDE_TOP)/stx/libbasic/Interval.$(H) $(INCLUDE_TOP)/stx/libbasic/KeyedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/LimitedPrecisionReal.$(H) $(INCLUDE_TOP)/stx/libbasic/Magnitude.$(H) $(INCLUDE_TOP)/stx/libbasic/Method.$(H) $(INCLUDE_TOP)/stx/libbasic/MethodDictionary.$(H) $(INCLUDE_TOP)/stx/libbasic/NameSpace.$(H) $(INCLUDE_TOP)/stx/libbasic/NonPositionableExternalStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/PeekableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Point.$(H) $(INCLUDE_TOP)/stx/libbasic/PositionableStream.$(H) $(INCLUDE_TOP)/stx/libbasic/ProgrammingLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Query.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ReadWriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic/Rectangle.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Set.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(INCLUDE_TOP)/stx/libbasic/SmallInteger.$(H) $(INCLUDE_TOP)/stx/libbasic/Smalltalk.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkLanguage.$(H) $(INCLUDE_TOP)/stx/libbasic/StandaloneStartup.$(H) $(INCLUDE_TOP)/stx/libbasic/Stream.$(H) $(INCLUDE_TOP)/stx/libbasic/String.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(H) $(INCLUDE_TOP)/stx/libbasic/Time.$(H) $(INCLUDE_TOP)/stx/libbasic/Timestamp.$(H) $(INCLUDE_TOP)/stx/libbasic/UndefinedObject.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/UserNotification.$(H) $(INCLUDE_TOP)/stx/libbasic/UserPreferences.$(H) $(INCLUDE_TOP)/stx/libbasic/Warning.$(H) $(INCLUDE_TOP)/stx/libbasic/WriteStream.$(H) $(INCLUDE_TOP)/stx/libbasic2/Iterator.$(H) $(INCLUDE_TOP)/stx/libbasic2/RunArray.$(H) $(INCLUDE_TOP)/stx/libbasic2/SocketAddress.$(H) $(INCLUDE_TOP)/stx/libbasic2/Text.$(H) $(INCLUDE_TOP)/stx/libbasic2/UUID.$(H) $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic3/ChangeSet.$(H) $(INCLUDE_TOP)/stx/libbasic3/CompositeChange.$(H) $(INCLUDE_TOP)/stx/libbasic3/ProfileTree.$(H) $(INCLUDE_TOP)/stx/libcomp/AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)/stx/libcomp/Breakpoint.$(H) $(INCLUDE_TOP)/stx/libcomp/BreakpointDescription.$(H) $(INCLUDE_TOP)/stx/libcomp/Parser.$(H) $(INCLUDE_TOP)/stx/libcomp/Scanner.$(H) $(INCLUDE_TOP)/stx/libview/Color.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/Form.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsMedium.$(H) $(INCLUDE_TOP)/stx/libview/Image.$(H) $(INCLUDE_TOP)/stx/libview/PopUpView.$(H) $(INCLUDE_TOP)/stx/libview/SimpleView.$(H) $(INCLUDE_TOP)/stx/libview/TopView.$(H) $(INCLUDE_TOP)/stx/libview/View.$(H) $(INCLUDE_TOP)/stx/libview2/ApplicationModel.$(H) $(INCLUDE_TOP)/stx/libview2/Model.$(H) $(INCLUDE_TOP)/stx/libview2/MultiImage.$(H) $(INCLUDE_TOP)/stx/libwidg/EditTextView.$(H) $(INCLUDE_TOP)/stx/libwidg/GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)/stx/libwidg/ListView.$(H) $(INCLUDE_TOP)/stx/libwidg/MenuView.$(H) $(INCLUDE_TOP)/stx/libwidg/PopUpMenu.$(H) $(INCLUDE_TOP)/stx/libwidg/SelectionInListView.$(H) $(INCLUDE_TOP)/stx/libwidg/TextView.$(H) $(INCLUDE_TOP)/stx/libwidg2/ListModelView.$(H) $(INCLUDE_TOP)/stx/libwidg2/SelectionInListModelView.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/Make.spec	Mon Dec 26 10:26:02 2016 +0000
+++ b/Make.spec	Thu Dec 29 00:19:01 2016 +0000
@@ -84,6 +84,7 @@
 	EventMonitor \
 	FileBrowser \
 	FileBrowserV2PanelView \
+	FileBrowserV2SettingsDialog \
 	FileBrowserV2UISpecifications \
 	FileDialog \
 	FileOperation \
@@ -95,6 +96,7 @@
 	MultiViewToolApplication \
 	PerforceSourceCodeManagerUtilities \
 	ProcessMonitorV2 \
+	RCSConflictEditTextView \
 	SyntaxElement \
 	SyntaxHighlighter2 \
 	SystemBrowser \
@@ -275,6 +277,7 @@
     $(OUTDIR_SLASH)EventMonitor.$(O) \
     $(OUTDIR_SLASH)FileBrowser.$(O) \
     $(OUTDIR_SLASH)FileBrowserV2PanelView.$(O) \
+    $(OUTDIR_SLASH)FileBrowserV2SettingsDialog.$(O) \
     $(OUTDIR_SLASH)FileBrowserV2UISpecifications.$(O) \
     $(OUTDIR_SLASH)FileDialog.$(O) \
     $(OUTDIR_SLASH)FileOperation.$(O) \
@@ -286,6 +289,7 @@
     $(OUTDIR_SLASH)MultiViewToolApplication.$(O) \
     $(OUTDIR_SLASH)PerforceSourceCodeManagerUtilities.$(O) \
     $(OUTDIR_SLASH)ProcessMonitorV2.$(O) \
+    $(OUTDIR_SLASH)RCSConflictEditTextView.$(O) \
     $(OUTDIR_SLASH)SyntaxElement.$(O) \
     $(OUTDIR_SLASH)SyntaxHighlighter2.$(O) \
     $(OUTDIR_SLASH)SystemBrowser.$(O) \
--- a/MultiViewToolApplication.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/MultiViewToolApplication.st	Thu Dec 29 00:19:01 2016 +0000
@@ -753,6 +753,13 @@
     ^ v notNil and:[v selectionAsString size > 0]
 !
 
+hasSelectionInActiveWorkspaceAndEditorIsNotReadonly
+    |v|
+
+    v := self selectedWorkspacesTextView.
+    ^ v notNil and:[v enabled and:[v selectionAsString size > 0]]
+!
+
 hasTextInActiveWorkspace
     |v|
 
--- a/Tools__CheckinInfoDialog.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/Tools__CheckinInfoDialog.st	Thu Dec 29 00:19:01 2016 +0000
@@ -228,20 +228,20 @@
           (LabelSpec
              label: 'Previous Log Messages:'
              name: 'Label5'
-             layout: (LayoutFrame 0 0 37 0 180 0 59 0)
+             layout: (LayoutFrame 0 0 37 0 220 0 67 0)
              translateLabel: true
              adjust: right
            )
           (ComboListSpec
              name: 'ComboList1'
-             layout: (LayoutFrame 180 0.0 38 0 0 1.0 58 0)
+             layout: (LayoutFrame 220 0.0 37 0 0 1.0 67 0)
              model: logHistoryHeadLineSelectionHolder
              comboList: logHistoryHeadLines
              useIndex: true
            )
           (TextEditorSpec
              name: 'TextEditor1'
-             layout: (LayoutFrame 2 0.0 68 0 -2 1 -300 1)
+             layout: (LayoutFrame 2 0.0 70 0 -2 1 -300 1)
              activeHelpKey: logMessage
              model: logMessageHolder
              hasHorizontalScrollBar: true
@@ -407,7 +407,7 @@
                    name: 'Button2'
                    translateLabel: true
                    model: doCancel
-                   extent: (Point 282 22)
+                   extent: (Point 282 35)
                    usePreferredHeight: true
                  )
                 (ActionButtonSpec
@@ -415,7 +415,7 @@
                    name: 'Button1'
                    translateLabel: true
                    model: doAccept
-                   extent: (Point 282 22)
+                   extent: (Point 282 35)
                    usePreferredHeight: true
                  )
                 )
--- a/Tools__Inspector2.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/Tools__Inspector2.st	Thu Dec 29 00:19:01 2016 +0000
@@ -108,7 +108,7 @@
 'Move backward in the history of previously visited objects'
 
 #browseClassOfShownObject
-'Open a SystemBrowser on the shown object''s class'
+'Open a SystemBrowser on the inspected object''s class'
 
 #browseFile
 'Open a FileBrowser on the file represented by the shown object'
--- a/Tools__NewSystemBrowser.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/Tools__NewSystemBrowser.st	Thu Dec 29 00:19:01 2016 +0000
@@ -53546,10 +53546,12 @@
     ] ifFalse:[
         menu := self menuFor: selector.
         menu itemsDo:[:item|
-            | selector |
-
-            selector := item value.
-            item itemValue:[self perform: selector with: item argument with: manager]
+            | eachSelector |
+
+            eachSelector := item value.
+            eachSelector notNil ifTrue:[
+                item itemValue:[self perform: eachSelector with: item argument with: manager]
+            ].
         ]
     ].
     self replaceSourceCodeManagerPlaceholderWith: manager in: menu.
--- a/WorkspaceApplication.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/WorkspaceApplication.st	Thu Dec 29 00:19:01 2016 +0000
@@ -1242,7 +1242,7 @@
             itemValue: doIt
           )
          (MenuItem
-            enabled: hasSelectionInActiveWorkspace
+            enabled: hasSelectionInActiveWorkspaceAndEditorIsNotReadonly
             label: 'PrintIt'
             itemValue: printIt
           )
--- a/abbrev.stc	Mon Dec 26 10:26:02 2016 +0000
+++ b/abbrev.stc	Thu Dec 29 00:19:01 2016 +0000
@@ -34,6 +34,7 @@
 EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 1
 FileBrowser FileBrowser stx:libtool 'Interface-Tools-File' 2
 FileBrowserV2PanelView FileBrowserV2PanelView stx:libtool 'Interface-Tools-File' 2
+FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 1
 FileBrowserV2UISpecifications FileBrowserV2UISpecifications stx:libtool 'Interface-Tools-File' 0
 FileDialog FileDialog stx:libtool 'Interface-Tools-File' 1
 FileOperation FileOperation stx:libtool 'Interface-Support' 0
@@ -46,6 +47,7 @@
 NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
 PerforceSourceCodeManagerUtilities PerforceSourceCodeManagerUtilities stx:libtool 'System-SourceCodeManagement' 0
 ProcessMonitorV2 ProcessMonitorV2 stx:libtool 'Monitors-ST/X' 1
+RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
 SyntaxElement SyntaxElement stx:libtool 'Interface-CodeView-Syntax' 0
 SyntaxHighlighter2 SyntaxHighlighter2 stx:libtool 'Interface-CodeView-Syntax' 3
 SystemBrowser SystemBrowser stx:libtool 'Interface-Browsers' 1
@@ -201,7 +203,6 @@
 ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
 EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
 ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 1
 FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 1
 FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 1
 HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
@@ -211,7 +212,6 @@
 OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
 ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
 ProjectView ProjectView stx:libtool 'Interface-Tools' 2
-RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
 SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
 SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
 SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
--- a/bc.mak	Mon Dec 26 10:26:02 2016 +0000
+++ b/bc.mak	Thu Dec 29 00:19:01 2016 +0000
@@ -113,6 +113,7 @@
 $(OUTDIR)EventMonitor.$(O) EventMonitor.$(C) EventMonitor.$(H): EventMonitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowser.$(O) FileBrowser.$(C) FileBrowser.$(H): FileBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\StandardSystemView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2PanelView.$(O) FileBrowserV2PanelView.$(C) FileBrowserV2PanelView.$(H): FileBrowserV2PanelView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg\VariablePanel.$(H) $(STCHDR)
+$(OUTDIR)FileBrowserV2SettingsDialog.$(O) FileBrowserV2SettingsDialog.$(C) FileBrowserV2SettingsDialog.$(H): FileBrowserV2SettingsDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2UISpecifications.$(O) FileBrowserV2UISpecifications.$(C) FileBrowserV2UISpecifications.$(H): FileBrowserV2UISpecifications.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libui\ComponentSpec.$(H) $(INCLUDE_TOP)\stx\libui\UISpecification.$(H) $(INCLUDE_TOP)\stx\libui\VariablePanelSpec.$(H) $(INCLUDE_TOP)\stx\libui\ViewSpec.$(H) $(INCLUDE_TOP)\stx\libui\ViewWithSubcomponentsSpec.$(H) $(STCHDR)
 $(OUTDIR)FileDialog.$(O) FileDialog.$(C) FileDialog.$(H): FileDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
 $(OUTDIR)FileOperation.$(O) FileOperation.$(C) FileOperation.$(H): FileOperation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -124,6 +125,7 @@
 $(OUTDIR)MultiViewToolApplication.$(O) MultiViewToolApplication.$(C) MultiViewToolApplication.$(H): MultiViewToolApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(STCHDR)
 $(OUTDIR)PerforceSourceCodeManagerUtilities.$(O) PerforceSourceCodeManagerUtilities.$(C) PerforceSourceCodeManagerUtilities.$(H): PerforceSourceCodeManagerUtilities.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
 $(OUTDIR)ProcessMonitorV2.$(O) ProcessMonitorV2.$(C) ProcessMonitorV2.$(H): ProcessMonitorV2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
+$(OUTDIR)RCSConflictEditTextView.$(O) RCSConflictEditTextView.$(C) RCSConflictEditTextView.$(H): RCSConflictEditTextView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(STCHDR)
 $(OUTDIR)SyntaxElement.$(O) SyntaxElement.$(C) SyntaxElement.$(H): SyntaxElement.st $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)SyntaxHighlighter2.$(O) SyntaxHighlighter2.$(C) SyntaxHighlighter2.$(H): SyntaxHighlighter2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libcomp\SyntaxHighlighter.$(H) $(STCHDR)
 $(OUTDIR)SystemBrowser.$(O) SystemBrowser.$(C) SystemBrowser.$(H): SystemBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
@@ -266,7 +268,7 @@
 $(OUTDIR)Tools__HierarchicalChangeList.$(O) Tools__HierarchicalChangeList.$(C) Tools__HierarchicalChangeList.$(H): Tools__HierarchicalChangeList.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserListWithFilter.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ChangeList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__HierarchicalPackageFilterList.$(O) Tools__HierarchicalPackageFilterList.$(C) Tools__HierarchicalPackageFilterList.$(H): Tools__HierarchicalPackageFilterList.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalProjectList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ProjectList.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabel.$(H) $(STCHDR)
 $(OUTDIR)Tools__InheritanceClassList.$(O) Tools__InheritanceClassList.$(C) Tools__InheritanceClassList.$(H): Tools__InheritanceClassList.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__BrowserList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__ClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__HierarchicalClassList.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__NavigatorModel.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Autoload.$(H) $(INCLUDE_TOP)\stx\libbasic\Bag.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\Date.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalLibraryFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\FileStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Filename.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Geometric.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Interval.$(H) $(INCLUDE_TOP)\stx\libbasic\KeyedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\MethodDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Point.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Rectangle.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\SmallInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\Smalltalk.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\Time.$(H) $(INCLUDE_TOP)\stx\libbasic\Timestamp.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic2\Iterator.$(H) $(INCLUDE_TOP)\stx\libbasic2\RunArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SocketAddress.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(INCLUDE_TOP)\stx\libbasic2\UUID.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic3\CompositeChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ProfileTree.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Breakpoint.$(H) $(INCLUDE_TOP)\stx\libcomp\BreakpointDescription.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libview\Color.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\MultiImage.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\PopUpMenu.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
+$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\ArithmeticValue.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Autoload.$(H) $(INCLUDE_TOP)\stx\libbasic\Bag.$(H) $(INCLUDE_TOP)\stx\libbasic\Behavior.$(H) $(INCLUDE_TOP)\stx\libbasic\Block.$(H) $(INCLUDE_TOP)\stx\libbasic\Boolean.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Character.$(H) $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Class.$(H) $(INCLUDE_TOP)\stx\libbasic\ClassDescription.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\CompiledCode.$(H) $(INCLUDE_TOP)\stx\libbasic\Date.$(H) $(INCLUDE_TOP)\stx\libbasic\Dictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\ExecutableFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalLibraryFunction.$(H) $(INCLUDE_TOP)\stx\libbasic\ExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\FileStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Filename.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\Geometric.$(H) $(INCLUDE_TOP)\stx\libbasic\IdentityDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\ImmutableArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Integer.$(H) $(INCLUDE_TOP)\stx\libbasic\Interval.$(H) $(INCLUDE_TOP)\stx\libbasic\KeyedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\LimitedPrecisionReal.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Method.$(H) $(INCLUDE_TOP)\stx\libbasic\MethodDictionary.$(H) $(INCLUDE_TOP)\stx\libbasic\NameSpace.$(H) $(INCLUDE_TOP)\stx\libbasic\NonPositionableExternalStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Point.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\ProgrammingLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Query.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadOnlySequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ReadWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Rectangle.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Set.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(INCLUDE_TOP)\stx\libbasic\SmallInteger.$(H) $(INCLUDE_TOP)\stx\libbasic\Smalltalk.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkLanguage.$(H) $(INCLUDE_TOP)\stx\libbasic\StandaloneStartup.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\String.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(H) $(INCLUDE_TOP)\stx\libbasic\Time.$(H) $(INCLUDE_TOP)\stx\libbasic\Timestamp.$(H) $(INCLUDE_TOP)\stx\libbasic\UndefinedObject.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\UserNotification.$(H) $(INCLUDE_TOP)\stx\libbasic\UserPreferences.$(H) $(INCLUDE_TOP)\stx\libbasic\Warning.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic2\Iterator.$(H) $(INCLUDE_TOP)\stx\libbasic2\RunArray.$(H) $(INCLUDE_TOP)\stx\libbasic2\SocketAddress.$(H) $(INCLUDE_TOP)\stx\libbasic2\Text.$(H) $(INCLUDE_TOP)\stx\libbasic2\UUID.$(H) $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic3\ChangeSet.$(H) $(INCLUDE_TOP)\stx\libbasic3\CompositeChange.$(H) $(INCLUDE_TOP)\stx\libbasic3\ProfileTree.$(H) $(INCLUDE_TOP)\stx\libcomp\AbstractSyntaxHighlighter.$(H) $(INCLUDE_TOP)\stx\libcomp\Breakpoint.$(H) $(INCLUDE_TOP)\stx\libcomp\BreakpointDescription.$(H) $(INCLUDE_TOP)\stx\libcomp\Parser.$(H) $(INCLUDE_TOP)\stx\libcomp\Scanner.$(H) $(INCLUDE_TOP)\stx\libview\Color.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\Image.$(H) $(INCLUDE_TOP)\stx\libview\PopUpView.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\TopView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\MultiImage.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\GenericToolbarIconLibrary.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\PopUpMenu.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
 
 # ENDMAKEDEPEND --- do not remove this line
 
--- a/extensions.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/extensions.st	Thu Dec 29 00:19:01 2016 +0000
@@ -1354,6 +1354,18 @@
 
 !Image methodsFor:'inspecting'!
 
+inspectorExtraAttributes
+    |d name|
+
+    d := super inspectorExtraAttributes.
+    (name := Icon nameIfKnownIcon:self) notNil ifTrue:[
+        d add:'-name' -> [ name ]
+    ].    
+    ^ d
+! !
+
+!Image methodsFor:'inspecting'!
+
 inspectorExtraMenuOperations
     ^ super inspectorExtraMenuOperations,
     {
--- a/libInit.cc	Mon Dec 26 10:26:02 2016 +0000
+++ b/libInit.cc	Thu Dec 29 00:19:01 2016 +0000
@@ -49,6 +49,7 @@
 extern void _EventMonitor_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _FileBrowser_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _FileBrowserV2PanelView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _FileBrowserV2SettingsDialog_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _FileBrowserV2UISpecifications_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _FileDialog_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _FileOperation_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -60,6 +61,7 @@
 extern void _MultiViewToolApplication_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _PerforceSourceCodeManagerUtilities_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _ProcessMonitorV2_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
+extern void _RCSConflictEditTextView_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _SyntaxElement_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _SyntaxHighlighter2_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
 extern void _SystemBrowser_Init(int pass, struct __vmData__ *__pRT__, OBJ snd);
@@ -248,6 +250,7 @@
     _EventMonitor_Init(pass,__pRT__,snd);
     _FileBrowser_Init(pass,__pRT__,snd);
     _FileBrowserV2PanelView_Init(pass,__pRT__,snd);
+    _FileBrowserV2SettingsDialog_Init(pass,__pRT__,snd);
     _FileBrowserV2UISpecifications_Init(pass,__pRT__,snd);
     _FileDialog_Init(pass,__pRT__,snd);
     _FileOperation_Init(pass,__pRT__,snd);
@@ -259,6 +262,7 @@
     _MultiViewToolApplication_Init(pass,__pRT__,snd);
     _PerforceSourceCodeManagerUtilities_Init(pass,__pRT__,snd);
     _ProcessMonitorV2_Init(pass,__pRT__,snd);
+    _RCSConflictEditTextView_Init(pass,__pRT__,snd);
     _SyntaxElement_Init(pass,__pRT__,snd);
     _SyntaxHighlighter2_Init(pass,__pRT__,snd);
     _SystemBrowser_Init(pass,__pRT__,snd);
--- a/stx_libtool.st	Mon Dec 26 10:26:02 2016 +0000
+++ b/stx_libtool.st	Thu Dec 29 00:19:01 2016 +0000
@@ -229,6 +229,7 @@
         EventMonitor
         FileBrowser
         FileBrowserV2PanelView
+        FileBrowserV2SettingsDialog
         FileBrowserV2UISpecifications
         FileDialog
         FileOperation
@@ -241,6 +242,7 @@
         (NewChangesBrowser autoload)
         PerforceSourceCodeManagerUtilities
         ProcessMonitorV2
+        RCSConflictEditTextView
         SyntaxElement
         SyntaxHighlighter2
         SystemBrowser
@@ -396,7 +398,6 @@
         (ColorInspectorView autoload)
         (EWorldIconLibrary autoload)
         (ExpandableRevisionItem autoload)
-        (FileBrowserV2SettingsDialog autoload)
         (FileBrowserV2Tests autoload)
         (FileDialogV2 autoload)
         (HierarchicalClassRevisionList autoload)
@@ -406,7 +407,6 @@
         (OldLauncher autoload)
         (ProcessMonitor autoload)
         (ProjectView autoload)
-        (RCSConflictEditTextView autoload)
         (SemaphoreMonitor autoload)
         (SmalltalkInspectorView autoload)
         (SourceRevisionItem autoload)
@@ -492,6 +492,7 @@
         Image inspector2TabImage
         Image inspector2Tabs
         Image inspectorClass
+        Image inspectorExtraAttributes
         Image inspectorExtraMenuOperations
         ImmutableArray inspectorValueStringInListFor:
         Integer inspectorExtraAttributes
--- a/stx_libtoolWINrc.rc	Mon Dec 26 10:26:02 2016 +0000
+++ b/stx_libtoolWINrc.rc	Thu Dec 29 00:19:01 2016 +0000
@@ -3,7 +3,7 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION     7,1,1,149
+  FILEVERSION     7,1,1,154
   PRODUCTVERSION  7,1,0,0
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -18,14 +18,14 @@
   BEGIN
     BLOCK "040904E4"
     BEGIN
-      VALUE "CompanyName", "eXept Software AG\0"
+      VALUE "CompanyName", "Claus Gittinger / eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
-      VALUE "FileVersion", "7.1.1.149\0"
+      VALUE "FileVersion", "7.1.1.154\0"
       VALUE "InternalName", "stx:libtool\0"
-      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 2012\0"
+      VALUE "LegalCopyright", "Copyright Claus Gittinger 1988\nCopyright eXept Software AG 2012\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "7.1.0.0\0"
-      VALUE "ProductDate", "Fri, 04 Nov 2016 14:13:17 GMT\0"
+      VALUE "ProductDate", "Tue, 27 Dec 2016 11:06:47 GMT\0"
     END
 
   END
hg/stx-libtool