Bugfix in merge tool. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Mon, 16 Nov 2015 13:33:19 +0000
branchjv
changeset 15950 23be8cf85415
parent 15937 b79f5d644b9a
child 15951 0cebe6652d14
Bugfix in merge tool. Due to a bug, even an unmerged code has been treated as merged and wrong .st file has been written (with <conflict> lines. This commit should fix this problem.
AbstractRevisionItem.st
AbstractVersionDiffBrowserItem.st
ApplicationBuilder.st
ChangeSetBrowser.st
ClassItem.st
ClassItemRoot.st
ClassItemRootForRevision.st
ClassNameItem.st
ClassRevisionTree.st
ClassVariablesInspectorView.st
CodeGeneratorTests.st
ColorInspectorView.st
DebugView.st
EWorldIconLibrary.st
EventMonitor.st
ExpandableRevisionItem.st
FileBrowserV2Tests.st
FileDialogV2.st
HierarchicalClassRevisionList.st
HierarchicalVersionDiffBrowser.st
LibraryBuilder.st
Make.proto
NewChangesBrowser.st
ProcessMonitor.st
ProjectView.st
RCSConflictEditTextView.st
SemaphoreMonitor.st
SmalltalkInspectorView.st
SourceRevisionItem.st
SystemStatusMonitor.st
TerminalApplication.st
TextDiffTests.st
Tools__ChangeSetDiffList.st
Tools__FontSettingsApplication.st
Tools__GenericToolbox.st
Tools__SmalltalkToolbox.st
Tools__Tag.st
Tools__TestRunnerEmbedded.st
Tools__TextDiff3Tool.st
VersionRevisionItem.st
XTermView.st
abbrev.stc
bc.mak
bmake.bat
extensions.st
mingwmake.bat
stx_libtool.st
vcmake.bat
--- a/AbstractRevisionItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/AbstractRevisionItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractVersionDiffBrowserItem subclass:#AbstractRevisionItem
 	instanceVariableNames:'revision'
 	classVariableNames:''
--- a/AbstractVersionDiffBrowserItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/AbstractVersionDiffBrowserItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 HierarchicalItem subclass:#AbstractVersionDiffBrowserItem
 	instanceVariableNames:''
 	classVariableNames:''
--- a/ApplicationBuilder.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ApplicationBuilder.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ToolApplicationModel subclass:#ApplicationBuilder
 	instanceVariableNames:'task shellView aspects'
 	classVariableNames:''
--- a/ChangeSetBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ChangeSetBrowser.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
--- a/ClassItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractVersionDiffBrowserItem subclass:#ClassItem
 	instanceVariableNames:'myClass isRegistered revisonColl revisionInfo'
 	classVariableNames:''
--- a/ClassItemRoot.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassItemRoot.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractVersionDiffBrowserItem subclass:#ClassItemRoot
 	instanceVariableNames:''
 	classVariableNames:''
--- a/ClassItemRootForRevision.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassItemRootForRevision.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ClassItemRoot subclass:#ClassItemRootForRevision
 	instanceVariableNames:''
 	classVariableNames:''
--- a/ClassNameItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassNameItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 HierarchicalItem subclass:#ClassNameItem
 	instanceVariableNames:'revisionInfo'
 	classVariableNames:''
--- a/ClassRevisionTree.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassRevisionTree.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationModel subclass:#ClassRevisionTree
 	instanceVariableNames:'selectionHolder dataHolder menuBlock selectionBlock listView
 		hierarchicalList'
--- a/ClassVariablesInspectorView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ClassVariablesInspectorView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SmalltalkInspectorView subclass:#ClassVariablesInspectorView
 	instanceVariableNames:''
 	classVariableNames:''
--- a/CodeGeneratorTests.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/CodeGeneratorTests.st	Mon Nov 16 13:33:19 2015 +0000
@@ -25,6 +25,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#CodeGeneratorTests
 	instanceVariableNames:'cg'
 	classVariableNames:''
--- a/ColorInspectorView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ColorInspectorView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 InspectorView subclass:#ColorInspectorView
 	instanceVariableNames:'colorView'
 	classVariableNames:''
--- a/DebugView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/DebugView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
 	      All Rights Reserved
@@ -2599,6 +2597,7 @@
     "Created: / 16.11.2001 / 17:36:18 / cg"
 ! !
 
+
 !DebugView methodsFor:'help'!
 
 flyByHelpDependsOnPositionIn:aView
@@ -9576,6 +9575,11 @@
     ^ '$Header$'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id$'
 ! !
--- a/EWorldIconLibrary.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/EWorldIconLibrary.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 XPToolbarIconLibrary subclass:#EWorldIconLibrary
 	instanceVariableNames:''
 	classVariableNames:''
--- a/EventMonitor.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/EventMonitor.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,19 +11,21 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationModel subclass:#EventMonitor
-        instanceVariableNames:'outputSelector'
-        classVariableNames:''
-        poolDictionaries:''
-        category:'Monitors-ST/X'
+	instanceVariableNames:'outputSelector'
+	classVariableNames:''
+	poolDictionaries:''
+	category:'Monitors-ST/X'
 !
 
 View subclass:#EventMonitorView
-        instanceVariableNames:'outputStream labelHolder showButtonMotion showFocusEvents
-                showTimestamp'
-        classVariableNames:''
-        poolDictionaries:''
-        privateIn:EventMonitor
+	instanceVariableNames:'outputStream labelHolder showButtonMotion showFocusEvents
+		showTimestamp'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:EventMonitor
 !
 
 !EventMonitor class methodsFor:'documentation'!
--- a/ExpandableRevisionItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ExpandableRevisionItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractRevisionItem subclass:#ExpandableRevisionItem
 	instanceVariableNames:''
 	classVariableNames:''
--- a/FileBrowserV2Tests.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/FileBrowserV2Tests.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#FileBrowserV2Tests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/FileDialogV2.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/FileDialogV2.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SimpleDialog subclass:#FileDialogV2
 	instanceVariableNames:'aspects directory pattern filterHolder initialText multipleSelect
 		doubleClickAction cancelLabelHolder okLabelHolder startFilename
--- a/HierarchicalClassRevisionList.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/HierarchicalClassRevisionList.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 HierarchicalList subclass:#HierarchicalClassRevisionList
 	instanceVariableNames:'itemComputationList semaphoreCritical itemTask currentItemInTask
 		dataColl'
--- a/HierarchicalVersionDiffBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/HierarchicalVersionDiffBrowser.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationModel subclass:#HierarchicalVersionDiffBrowser
 	instanceVariableNames:'versionDiffBrowser classTree treeSelectionHolder classHolder'
 	classVariableNames:''
--- a/LibraryBuilder.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/LibraryBuilder.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ApplicationBuilder subclass:#LibraryBuilder
 	instanceVariableNames:''
 	classVariableNames:''
--- a/Make.proto	Fri Nov 13 06:40:27 2015 +0100
+++ b/Make.proto	Mon Nov 16 13:33:19 2015 +0000
@@ -335,7 +335,7 @@
 $(OUTDIR)Tools__HierarchicalChangeList.$(O) 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.$(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.$(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/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/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Point.$(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/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/String.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(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/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/DeviceGraphicsContext.$(H) $(INCLUDE_TOP)/stx/libview/DisplaySurface.$(H) $(INCLUDE_TOP)/stx/libview/Form.$(H) $(INCLUDE_TOP)/stx/libview/GraphicsContext.$(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/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/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/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/Notification.$(H) $(INCLUDE_TOP)/stx/libbasic/Number.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Point.$(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/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/String.$(H) $(INCLUDE_TOP)/stx/libbasic/StringCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Symbol.$(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/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/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/NewChangesBrowser.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/NewChangesBrowser.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 ToolApplicationModel subclass:#NewChangesBrowser
 	instanceVariableNames:'changes changeFileName skipSignal changeFileTimestamp
 		autoUpdateBlock filterCompletionBlock editingClassSource modified'
--- a/ProcessMonitor.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ProcessMonitor.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SystemStatusMonitor subclass:#ProcessMonitor
 	instanceVariableNames:'processes hideDead runColor suspendedColor waitColor cpuUsages
 		showDetail'
--- a/ProjectView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/ProjectView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 StandardSystemView subclass:#ProjectView
 	instanceVariableNames:'myProject toggle'
 	classVariableNames:'ActiveProjectView'
--- a/RCSConflictEditTextView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/RCSConflictEditTextView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 EditTextView subclass:#RCSConflictEditTextView
 	instanceVariableNames:''
 	classVariableNames:''
--- a/SemaphoreMonitor.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/SemaphoreMonitor.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SystemStatusMonitor subclass:#SemaphoreMonitor
 	instanceVariableNames:'semaphores'
 	classVariableNames:''
--- a/SmalltalkInspectorView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/SmalltalkInspectorView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 DictionaryInspectorView subclass:#SmalltalkInspectorView
 	instanceVariableNames:''
 	classVariableNames:''
--- a/SourceRevisionItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/SourceRevisionItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractRevisionItem subclass:#SourceRevisionItem
 	instanceVariableNames:''
 	classVariableNames:''
--- a/SystemStatusMonitor.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/SystemStatusMonitor.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 SimpleView subclass:#SystemStatusMonitor
 	instanceVariableNames:'listView listUpdateDelay updateDelay updateBlock listUpdateBlock
 		updateProcess'
--- a/TerminalApplication.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/TerminalApplication.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 MultiViewToolApplication subclass:#TerminalApplication
 	instanceVariableNames:'initialDirectory keepAlive keepAliveProcess'
 	classVariableNames:''
--- a/TextDiffTests.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/TextDiffTests.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 TestCase subclass:#TextDiffTests
 	instanceVariableNames:''
 	classVariableNames:''
--- a/Tools__ChangeSetDiffList.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__ChangeSetDiffList.st	Mon Nov 16 13:33:19 2015 +0000
@@ -455,11 +455,11 @@
 
 listEntryLabelFor:diff 
 
-    ^listEntryLabelGenerator 
-        ifNotNil: [listEntryLabelGenerator value: diff]
-        ifNil:[diff name]
+    ^listEntryLabelGenerator isNil 
+           ifTrue:[ diff name ]
+           ifFalse:[ listEntryLabelGenerator value:diff ]
 
-    "Modified: / 24-11-2009 / 10:00:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2015 / 11:57:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 makeDependent
@@ -547,12 +547,12 @@
 
 label
 
-    ^application 
-        ifNotNil:[application listEntryLabelFor: model]
-        ifNil:[model displayString]
+    ^application isNil 
+           ifTrue:[ model displayString ]
+           ifFalse:[ application listEntryLabelFor:model ]
 
     "Created: / 24-11-2009 / 18:26:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 26-11-2009 / 17:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2015 / 11:55:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 model
--- a/Tools__FontSettingsApplication.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__FontSettingsApplication.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,14 @@
-"{ Encoding: utf8 }"
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
 
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libtool' }"
 
 "{ NameSpace: Tools }"
@@ -19,6 +28,21 @@
 	category:'Interface-Smalltalk'
 !
 
+!FontSettingsApplication class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+! !
 
 !FontSettingsApplication class methodsFor:'instance creation'!
 
--- a/Tools__GenericToolbox.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__GenericToolbox.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libtool' }"
 
 "{ NameSpace: Tools }"
@@ -11,6 +22,20 @@
 
 !GenericToolbox class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
 documentation
 "
     A generic toolbox for languages that compiles into Smalltalk/X bytecode.
--- a/Tools__SmalltalkToolbox.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__SmalltalkToolbox.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,3 +1,14 @@
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libtool' }"
 
 "{ NameSpace: Tools }"
@@ -11,6 +22,20 @@
 
 !SmalltalkToolbox class methodsFor:'documentation'!
 
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+!
+
 documentation
 "
     A toolbox for Smalltalk language
--- a/Tools__Tag.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__Tag.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG 
 	      All Rights Reserved
@@ -1479,6 +1477,11 @@
     ^ '$Header$'
 !
 
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+!
+
 version_SVN
     ^ '$Id$'
 ! !
--- a/Tools__TestRunnerEmbedded.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__TestRunnerEmbedded.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,14 @@
-"{ Encoding: utf8 }"
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
 
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
 "{ Package: 'stx:libtool' }"
 
 "{ NameSpace: Tools }"
@@ -11,6 +20,21 @@
 	category:'SUnit-UI'
 !
 
+!TestRunnerEmbedded class methodsFor:'documentation'!
+
+copyright
+"
+ COPYRIGHT (c) 2006 by eXept Software AG
+              All Rights Reserved
+
+ This software is furnished under a license and may be used
+ only in accordance with the terms of that license and with the
+ inclusion of the above copyright notice.   This software may not
+ be provided or otherwise made available to, or used by, any
+ other person.  No title to or ownership of the software is
+ hereby transferred.
+"
+! !
 
 !TestRunnerEmbedded class methodsFor:'plugIn spec'!
 
--- a/Tools__TextDiff3Tool.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/Tools__TextDiff3Tool.st	Mon Nov 16 13:33:19 2015 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -24,7 +22,7 @@
 !
 
 CodeViewService subclass:#MergeService
-	instanceVariableNames:'dataHolder data sectionIntervalHolder'
+	instanceVariableNames:'dataHolder data sectionIntervalHolder ignoreLinesModifiedFromTo'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:TextDiff3Tool
@@ -1036,7 +1034,7 @@
         ^ self  "/not yet registered
     ]. 
     data isNil ifTrue:[
-        textView list: #().
+        textView list: StringCollection new.
         ^self.
     ].
 
@@ -1044,14 +1042,19 @@
     changed := data listInfos 
                 select:[:info|info isConflict]
                 thenCollect:[:info|info line].
-
-    textView changedLines: changed.
-    textView diffMode: true.
-    textView list: data list.
+    [ 
+        ignoreLinesModifiedFromTo := true.    
+        textView changedLines: changed.
+        textView diffMode: true.
+        textView list: data list.
+    ] ensure:[ 
+        ignoreLinesModifiedFromTo := false.
+    ].
     textView invalidate.
     gutterView invalidate.
 
     "Created: / 19-03-2012 / 12:41:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2015 / 13:16:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 dataHolderChanged
@@ -1178,6 +1181,7 @@
 
 linesModifiedFrom: start to: end
 
+    ignoreLinesModifiedFromTo ifTrue:[ ^ self ].
     start to: end do:[:i|
         (data listInfos at:i) resolution: #Merged.
     ].
@@ -1185,6 +1189,17 @@
 
     "Created: / 06-07-2011 / 17:14:36 / jv"
     "Created: / 20-03-2012 / 22:57:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2015 / 12:36:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
+!TextDiff3Tool::MergeService methodsFor:'initialization'!
+
+initialize
+    "Invoked when a new instance is created."
+    super initialize.
+    ignoreLinesModifiedFromTo := false.
+
+    "Created: / 16-11-2015 / 12:36:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !TextDiff3Tool::MergeService methodsFor:'registering'!
--- a/VersionRevisionItem.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/VersionRevisionItem.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 AbstractRevisionItem subclass:#VersionRevisionItem
 	instanceVariableNames:''
 	classVariableNames:''
--- a/XTermView.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/XTermView.st	Mon Nov 16 13:33:19 2015 +0000
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 XEmbedContainerView subclass:#XTermView
 	instanceVariableNames:'pid wid wd'
 	classVariableNames:'XTermType XTermExecutable'
--- a/abbrev.stc	Fri Nov 13 06:40:27 2015 +0100
+++ b/abbrev.stc	Mon Nov 16 13:33:19 2015 +0000
@@ -6,6 +6,8 @@
 AbstractFileBrowser AbstractFileBrowser stx:libtool 'Interface-Tools-File' 3
 AbstractLauncherApplication AbstractLauncherApplication stx:libtool 'Interface-Smalltalk' 7
 AbstractSettingsApplication AbstractSettingsApplication stx:libtool 'Interface-Smalltalk' 1
+AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
+ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
 Bookmark Bookmark stx:libtool 'Interface-Bookmarks' 0
 BookmarkBar BookmarkBar stx:libtool 'Interface-Bookmarks' 1
 BookmarkEditor BookmarkEditor stx:libtool 'Interface-Bookmarks' 1
@@ -15,9 +17,12 @@
 BookmarksEditDialog BookmarksEditDialog stx:libtool 'Interface-Tools-File' 1
 BrowserView BrowserView stx:libtool 'Interface-Browsers' 2
 ChangesBrowser ChangesBrowser stx:libtool 'Interface-Browsers' 2
+ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
+ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
 CodeCompletionHelpMenuView CodeCompletionHelpMenuView stx:libtool 'Interface-Help' 2
 CodeCompletionHelpView CodeCompletionHelpView stx:libtool 'Interface-Help' 2
 CodeGenerator CodeGenerator stx:libtool 'Interface-Browsers' 0
+CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 1
 CodeGeneratorTool CodeGeneratorTool stx:libtool 'Interface-Browsers' 0
 DebugView DebugView stx:libtool 'Interface-Debugger' 2
 Diff Diff stx:libtool 'Collections-Support' 0
@@ -28,24 +33,37 @@
 Diff3TextView Diff3TextView stx:libtool 'Views-Text' 2
 DiffListUtility DiffListUtility stx:libtool 'Views-Text' 0
 DiffTextView DiffTextView stx:libtool 'Views-Text' 2
+EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
 EditFieldWithCompletion EditFieldWithCompletion stx:libtool 'Views-Text' 2
 EditFieldWithCompletionSpec EditFieldWithCompletionSpec stx:libtool 'Interface-Support-UI-Specs' 0
+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
+FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 1
 FileBrowserV2UISpecifications FileBrowserV2UISpecifications stx:libtool 'Interface-Tools-File' 0
 FileDialog FileDialog stx:libtool 'Interface-Tools-File' 1
+FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 1
 FileOperation FileOperation stx:libtool 'Interface-Support' 0
 FilenameEditFieldV2 FilenameEditFieldV2 stx:libtool 'Interface-Tools-File' 2
+HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
+HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 InspectorView InspectorView stx:libtool 'Interface-Inspector' 2
 MemoryMonitor MemoryMonitor stx:libtool 'Monitors-ST/X' 1
 MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X' 2
 MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X' 2
 MultiViewToolApplication MultiViewToolApplication stx:libtool 'Interface-Smalltalk' 7
+NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
+OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
 PerforceSourceCodeManagerUtilities PerforceSourceCodeManagerUtilities stx:libtool 'System-SourceCodeManagement' 0
 ProcessMonitorV2 ProcessMonitorV2 stx:libtool 'Monitors-ST/X' 1
+ProjectView ProjectView stx:libtool 'Interface-Tools' 2
+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
+SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 2
+TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 1
 Tools::AbstractTestRunner Tools__AbstractTestRunner stx:libtool 'SUnit-UI' 1
 Tools::BreakpointBrowser Tools__BreakpointBrowser stx:libtool 'Interface-Debugger' 1
 Tools::Browslet Tools__Browslet stx:libtool 'Interface-Browsers-Browslets' 1
@@ -62,8 +80,10 @@
 Tools::CodeCompletionMenu Tools__CodeCompletionMenu stx:libtool 'Interface-CodeView' 2
 Tools::CodeCritics Tools__CodeCritics stx:libtool 'Interface-Browsers-New' 0
 Tools::CodeView2 Tools__CodeView2 stx:libtool 'Interface-CodeView' 2
+Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::CodeViewService Tools__CodeViewService stx:libtool 'Interface-CodeView' 0
 Tools::DiffCodeView2 Tools__DiffCodeView2 stx:libtool 'Interface-CodeView' 2
+Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::HierarchicalChangesetDialog Tools__HierarchicalChangesetDialog stx:libtool 'Interface-Dialogs' 1
 Tools::InlineMessageDialog Tools__InlineMessageDialog stx:libtool 'Interface-Tools' 1
 Tools::Inspector2 Tools__Inspector2 stx:libtool 'Interface-Inspector2' 1
@@ -76,6 +96,7 @@
 Tools::MethodCategoryCache Tools__MethodCategoryCache stx:libtool 'Interface-Browsers-New' 0
 Tools::MethodRewriter Tools__MethodRewriter stx:libtool 'Interface-Tools' 1
 Tools::NavigationHistory Tools__NavigationHistory stx:libtool 'Interface-Browsers-New-History' 0
+Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-Browsers-New-History' 1
 Tools::NavigationState Tools__NavigationState stx:libtool 'Interface-Browsers-New' 0
 Tools::NavigatorModel Tools__NavigatorModel stx:libtool 'Interface-Browsers-New' 1
 Tools::NewClassWizardDialog Tools__NewClassWizardDialog stx:libtool 'Interface-Browsers-New' 1
@@ -95,17 +116,27 @@
 Tools::TagsBrowser Tools__TagsBrowser stx:libtool 'Interface-Tools-File-Tags' 1
 Tools::TextDiffTool Tools__TextDiffTool stx:libtool 'Interface-Diff' 1
 Tools::TextMergeInfo Tools__TextMergeInfo stx:libtool 'Interface-Diff' 0
+Tools::ToDoList Tools__ToDoList stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
+Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
 Tools::Toolbox Tools__Toolbox stx:libtool 'Interface-Tools' 0
 Tools::WebBrowserPage Tools__WebBrowserPage stx:libtool 'Interface-Browsers-Web' 1
 VersionDiffBrowser VersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 ViewWithAcceptAndCancelBar ViewWithAcceptAndCancelBar stx:libtool 'Views-Basic' 2
 Win32FileDialog Win32FileDialog stx:libtool 'Interface-Tools-File' 0
+XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
 stx_libtool stx_libtool stx:libtool '* Projects & Packages *' 3
 AbstractDirectoryBrowser AbstractDirectoryBrowser stx:libtool 'Interface-Tools-File' 3
 AbstractFileFinderApplicationComponent AbstractFileFinderApplicationComponent stx:libtool 'Interface-Tools-File' 1
+AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 AbstractSourceCodeManagementSettingsAppl AbstractSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 BookmarkMenuBuilder BookmarkMenuBuilder stx:libtool 'Interface-Bookmarks' 0
+ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
 ClassInspectorView ClassInspectorView stx:libtool 'Interface-Inspector' 2
+ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
+ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
+ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
 ContextInspectorView ContextInspectorView stx:libtool 'Interface-Inspector' 2
 DictionaryInspectorView DictionaryInspectorView stx:libtool 'Interface-Inspector' 2
 Diff3ExclusiveVisitor Diff3ExclusiveVisitor stx:libtool 'Collections-Sequenceable-Diff' 0
@@ -115,19 +146,25 @@
 FileBrowserV2SettingsAppl FileBrowserV2SettingsAppl stx:libtool 'Interface-Tools-File' 1
 FileDialogWithPreview FileDialogWithPreview stx:libtool 'Interface-Tools-File' 1
 ImageInspectorView ImageInspectorView stx:libtool 'Interface-Inspector' 2
+Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
+LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
 NewLauncher NewLauncher stx:libtool 'Interface-Smalltalk' 7
 OrderedCollectionInspectorView OrderedCollectionInspectorView stx:libtool 'Interface-Inspector' 2
 ParseTreeIndex ParseTreeIndex stx:libtool 'Interface-CodeView-Syntax' 0
+ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
+SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
 SetInspectorView SetInspectorView stx:libtool 'Interface-Inspector' 2
 SettingsDialog SettingsDialog stx:libtool 'Interface-Smalltalk' 1
 SmalltalkCodeGeneratorTool SmalltalkCodeGeneratorTool stx:libtool 'Interface-Browsers' 0
 SyntaxElementVariable SyntaxElementVariable stx:libtool 'Interface-CodeView-Syntax' 0
+TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 7
 Tools::BackgroundSourceProcessingService Tools__BackgroundSourceProcessingService stx:libtool 'Interface-CodeView' 0
 Tools::BreakpointService Tools__BreakpointService stx:libtool 'Interface-CodeView' 0
 Tools::BrowserList Tools__BrowserList stx:libtool 'Interface-Browsers-New' 1
 Tools::CodeCompletionService Tools__CodeCompletionService stx:libtool 'Interface-CodeView' 0
 Tools::CodeNavigationService Tools__CodeNavigationService stx:libtool 'Interface-CodeView' 0
 Tools::CodeView2SettingsAppl Tools__CodeView2SettingsAppl stx:libtool 'Interface-CodeView' 1
+Tools::CompilerWarningToDoListEntry Tools__CompilerWarningToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
 Tools::Diff2CodeView2 Tools__Diff2CodeView2 stx:libtool 'Interface-CodeView' 2
 Tools::Diff3CodeView2 Tools__Diff3CodeView2 stx:libtool 'Interface-CodeView' 2
 Tools::FontSettingsApplication Tools__FontSettingsApplication stx:libtool 'Interface-Smalltalk' 1
@@ -138,6 +175,7 @@
 Tools::NewSystemBrowser Tools__NewSystemBrowser stx:libtool 'Interface-Browsers-New' 1
 Tools::OrganizerCanvas Tools__OrganizerCanvas stx:libtool 'Interface-Browsers-New' 1
 Tools::SendersBrowslet Tools__SendersBrowslet stx:libtool 'Interface-Browsers-Browslets' 1
+Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 1
 Tools::StringSearchToolForTextView Tools__StringSearchToolForTextView stx:libtool 'Interface-Tools' 1
 Tools::TestRunnerMini Tools__TestRunnerMini stx:libtool 'SUnit-UI' 1
 Tools::TextDiff2Tool Tools__TextDiff2Tool stx:libtool 'Interface-Diff' 1
@@ -147,15 +185,19 @@
 BookmarkAddMenuBuilder BookmarkAddMenuBuilder stx:libtool 'Interface-Bookmarks' 0
 BookmarkToolbarMenuBuilder BookmarkToolbarMenuBuilder stx:libtool 'Interface-Bookmarks' 0
 CVSSourceCodeManagementSettingsAppl CVSSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
+ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
 DataBaseSourceCodeManagementSettingsAppl DataBaseSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 DirectoryContentsBrowser DirectoryContentsBrowser stx:libtool 'Interface-Tools-File' 3
 DirectoryDifferenceViewApplication DirectoryDifferenceViewApplication stx:libtool 'Interface-Tools-File' 1
 DirectoryTreeBrowser DirectoryTreeBrowser stx:libtool 'Interface-Tools-File' 3
+ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 FileBasedSourceCodeManagementSettingsAppl FileBasedSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 FindFileApplication FindFileApplication stx:libtool 'Interface-Tools-File' 1
 GitSourceCodeManagementSettingsAppl GitSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 MercurialSourceCodeManagementSettingsAppl MercurialSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 PerforceSourceCodeManagementSettingsAppl PerforceSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
+SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
+SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 StoreSourceCodeManagementSettingsAppl StoreSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 Tools::BrowserListWithFilter Tools__BrowserListWithFilter stx:libtool 'Interface-Browsers-New' 1
 Tools::ClassCategoryList Tools__ClassCategoryList stx:libtool 'Interface-Browsers-New' 1
@@ -170,6 +212,8 @@
 Tools::SmalltalkToolbox Tools__SmalltalkToolbox stx:libtool 'Interface-Tools' 0
 Tools::TestRunnerEmbedded Tools__TestRunnerEmbedded stx:libtool 'SUnit-UI' 1
 Tools::VariableList Tools__VariableList stx:libtool 'Interface-Browsers-New' 1
+VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
 Tools::ChangeList Tools__ChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::ChangeSetDiffList Tools__ChangeSetDiffList stx:libtool 'Interface-Diff' 1
 Tools::FullMethodCategoryList Tools__FullMethodCategoryList stx:libtool 'Interface-Browsers-New' 1
@@ -184,47 +228,3 @@
 Tools::HierarchicalChangeList Tools__HierarchicalChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::HierarchicalPackageFilterList Tools__HierarchicalPackageFilterList stx:libtool 'Interface-Browsers-New-Profiler' 1
 Tools::InheritanceClassList Tools__InheritanceClassList stx:libtool 'Interface-Browsers-New' 1
-ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
-ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
-NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
-XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
-AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
-ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
-ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
-ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
-CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 1
-EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
-EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 1
-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
-HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
-OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
-ProjectView ProjectView stx:libtool 'Interface-Tools' 2
-RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
-SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 2
-TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 1
-Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 1
-Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 1
-Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-Browsers-New-History' 1
-Tools::ToDoList Tools__ToDoList stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
-Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
-AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
-ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
-Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
-LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
-ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
-SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
-TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 7
-Tools::CompilerWarningToDoListEntry Tools__CompilerWarningToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 1
-ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
-ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
-SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
--- a/bc.mak	Fri Nov 13 06:40:27 2015 +0100
+++ b/bc.mak	Mon Nov 16 13:33:19 2015 +0000
@@ -80,7 +80,7 @@
 
 
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
-$(OUTDIR)AboutBox.$(O) AboutBox.$(H): AboutBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(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) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(INCLUDE_TOP)\stx\libwidg\InfoBox.$(H) $(STCHDR)
+$(OUTDIR)AboutBox.$(O) AboutBox.$(H): AboutBox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(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) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(INCLUDE_TOP)\stx\libwidg\InfoBox.$(H) $(STCHDR)
 $(OUTDIR)AbstractFileApplicationNoteBookComponent.$(O) AbstractFileApplicationNoteBookComponent.$(H): AbstractFileApplicationNoteBookComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)AbstractFileBrowser.$(O) AbstractFileBrowser.$(H): AbstractFileBrowser.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)AbstractLauncherApplication.$(O) AbstractLauncherApplication.$(H): AbstractLauncherApplication.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)
@@ -92,33 +92,33 @@
 $(OUTDIR)BookmarkListEditor.$(O) BookmarkListEditor.$(H): BookmarkListEditor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)BookmarkVisitor.$(O) BookmarkVisitor.$(H): BookmarkVisitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)BookmarksEditDialog.$(O) BookmarksEditDialog.$(H): BookmarksEditDialog.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)BrowserView.$(O) BrowserView.$(H): BrowserView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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)ChangesBrowser.$(O) ChangesBrowser.$(H): ChangesBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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)CodeCompletionHelpMenuView.$(O) CodeCompletionHelpMenuView.$(H): CodeCompletionHelpMenuView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(STCHDR)
-$(OUTDIR)CodeCompletionHelpView.$(O) CodeCompletionHelpView.$(H): CodeCompletionHelpView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
+$(OUTDIR)BrowserView.$(O) BrowserView.$(H): BrowserView.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)ChangesBrowser.$(O) ChangesBrowser.$(H): ChangesBrowser.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)CodeCompletionHelpMenuView.$(O) CodeCompletionHelpMenuView.$(H): CodeCompletionHelpMenuView.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\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\MenuView.$(H) $(INCLUDE_TOP)\stx\libwidg\SelectionInListView.$(H) $(STCHDR)
+$(OUTDIR)CodeCompletionHelpView.$(O) CodeCompletionHelpView.$(H): CodeCompletionHelpView.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) $(STCHDR)
 $(OUTDIR)CodeGenerator.$(O) CodeGenerator.$(H): CodeGenerator.st $(INCLUDE_TOP)\stx\goodies\refactoryBrowser\parser\RBProgramNodeVisitor.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)CodeGeneratorTool.$(O) CodeGeneratorTool.$(H): CodeGeneratorTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)DebugView.$(O) DebugView.$(H): DebugView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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)DebugView.$(O) DebugView.$(H): DebugView.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)Diff.$(O) Diff.$(H): Diff.st $(INCLUDE_TOP)\stx\libbasic\Link.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Diff2.$(O) Diff2.$(H): Diff2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Diff3.$(O) Diff3.$(H): Diff3.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Diff3Hunk.$(O) Diff3Hunk.$(H): Diff3Hunk.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Diff3InclusiveVisitor.$(O) Diff3InclusiveVisitor.$(H): Diff3InclusiveVisitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Diff3TextView.$(O) Diff3TextView.$(H): Diff3TextView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ThreeColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)Diff3TextView.$(O) Diff3TextView.$(H): Diff3TextView.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\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ThreeColumnTextView.$(H) $(STCHDR)
 $(OUTDIR)DiffListUtility.$(O) DiffListUtility.$(H): DiffListUtility.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)DiffTextView.$(O) DiffTextView.$(H): DiffTextView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\AbstractBackground.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
-$(OUTDIR)EditFieldWithCompletion.$(O) EditFieldWithCompletion.$(H): EditFieldWithCompletion.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\EditField.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(STCHDR)
+$(OUTDIR)DiffTextView.$(O) DiffTextView.$(H): DiffTextView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\AbstractBackground.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)EditFieldWithCompletion.$(O) EditFieldWithCompletion.$(H): EditFieldWithCompletion.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\EditField.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(STCHDR)
 $(OUTDIR)EditFieldWithCompletionSpec.$(O) EditFieldWithCompletionSpec.$(H): EditFieldWithCompletionSpec.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libui\ComponentSpec.$(H) $(INCLUDE_TOP)\stx\libui\InputFieldSpec.$(H) $(INCLUDE_TOP)\stx\libui\MenuComponentSpec.$(H) $(INCLUDE_TOP)\stx\libui\NamedSpec.$(H) $(INCLUDE_TOP)\stx\libui\UISpecification.$(H) $(STCHDR)
-$(OUTDIR)FileBrowser.$(O) FileBrowser.$(H): FileBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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.$(H): FileBrowserV2PanelView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg\VariablePanel.$(H) $(STCHDR)
+$(OUTDIR)FileBrowser.$(O) 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.$(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)FileBrowserV2UISpecifications.$(O) 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.$(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.$(H): FileOperation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)FilenameEditFieldV2.$(O) FilenameEditFieldV2.$(H): FilenameEditFieldV2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg2\ComboBoxView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ComboView.$(H) $(STCHDR)
-$(OUTDIR)InspectorView.$(O) InspectorView.$(H): InspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)FilenameEditFieldV2.$(O) FilenameEditFieldV2.$(H): FilenameEditFieldV2.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\libwidg2\ComboBoxView.$(H) $(INCLUDE_TOP)\stx\libwidg2\ComboView.$(H) $(STCHDR)
+$(OUTDIR)InspectorView.$(O) InspectorView.$(H): InspectorView.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) $(STCHDR)
 $(OUTDIR)MemoryMonitor.$(O) MemoryMonitor.$(H): MemoryMonitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)MemoryMonitorView.$(O) MemoryMonitorView.$(H): MemoryMonitorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(STCHDR)
-$(OUTDIR)MemoryUsageView.$(O) MemoryUsageView.$(H): MemoryUsageView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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)MemoryMonitorView.$(O) MemoryMonitorView.$(H): MemoryMonitorView.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) $(STCHDR)
+$(OUTDIR)MemoryUsageView.$(O) MemoryUsageView.$(H): MemoryUsageView.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)MultiViewToolApplication.$(O) 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.$(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.$(H): ProcessMonitorV2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
@@ -138,11 +138,11 @@
 $(OUTDIR)Tools__CheckinInfoDialog.$(O) Tools__CheckinInfoDialog.$(H): Tools__CheckinInfoDialog.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)Tools__ClassChecker.$(O) Tools__ClassChecker.$(H): Tools__ClassChecker.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__ClassSorter.$(O) Tools__ClassSorter.$(H): Tools__ClassSorter.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__CodeCompletionMenu.$(O) Tools__CodeCompletionMenu.$(H): Tools__CodeCompletionMenu.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
+$(OUTDIR)Tools__CodeCompletionMenu.$(O) Tools__CodeCompletionMenu.$(H): Tools__CodeCompletionMenu.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\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
 $(OUTDIR)Tools__CodeCritics.$(O) Tools__CodeCritics.$(H): Tools__CodeCritics.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__CodeView2.$(O) Tools__CodeView2.$(H): Tools__CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\AbstractBackground.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\CodeView.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\Workspace.$(H) $(STCHDR)
+$(OUTDIR)Tools__CodeView2.$(O) Tools__CodeView2.$(H): Tools__CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\AbstractBackground.$(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\CodeView.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\Workspace.$(H) $(STCHDR)
 $(OUTDIR)Tools__CodeViewService.$(O) Tools__CodeViewService.$(H): Tools__CodeViewService.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)Tools__DiffCodeView2.$(O) Tools__DiffCodeView2.$(H): Tools__DiffCodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)Tools__DiffCodeView2.$(O) Tools__DiffCodeView2.$(H): Tools__DiffCodeView2.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\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
 $(OUTDIR)Tools__HierarchicalChangesetDialog.$(O) Tools__HierarchicalChangesetDialog.$(H): Tools__HierarchicalChangesetDialog.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) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)Tools__InlineMessageDialog.$(O) Tools__InlineMessageDialog.$(H): Tools__InlineMessageDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__Inspector2.$(O) Tools__Inspector2.$(H): Tools__Inspector2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
@@ -158,46 +158,46 @@
 $(OUTDIR)Tools__NavigationState.$(O) Tools__NavigationState.$(H): Tools__NavigationState.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__NavigatorModel.$(O) Tools__NavigatorModel.$(H): Tools__NavigatorModel.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__NewClassWizardDialog.$(O) Tools__NewClassWizardDialog.$(H): Tools__NewClassWizardDialog.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)Tools__NewSystemBrowserCodeView.$(O) Tools__NewSystemBrowserCodeView.$(H): Tools__NewSystemBrowserCodeView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\CodeView.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\Workspace.$(H) $(STCHDR)
+$(OUTDIR)Tools__NewSystemBrowserCodeView.$(O) Tools__NewSystemBrowserCodeView.$(H): Tools__NewSystemBrowserCodeView.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\CodeView.$(H) $(INCLUDE_TOP)\stx\libwidg\EditTextView.$(H) $(INCLUDE_TOP)\stx\libwidg\ListView.$(H) $(INCLUDE_TOP)\stx\libwidg\TextCollector.$(H) $(INCLUDE_TOP)\stx\libwidg\TextView.$(H) $(INCLUDE_TOP)\stx\libwidg\Workspace.$(H) $(STCHDR)
 $(OUTDIR)Tools__Profiler.$(O) Tools__Profiler.$(H): Tools__Profiler.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\MessageTally.$(H) $(STCHDR)
 $(OUTDIR)Tools__ProfilerInfoBuilder.$(O) Tools__ProfilerInfoBuilder.$(H): Tools__ProfilerInfoBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__ProfilerInfoItem.$(O) Tools__ProfilerInfoItem.$(H): Tools__ProfilerInfoItem.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libwidg2\AbstractHierarchicalItem.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItem.$(H) $(STCHDR)
 $(OUTDIR)Tools__ProjectCheckerBrowser.$(O) Tools__ProjectCheckerBrowser.$(H): Tools__ProjectCheckerBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__ProjectLoader.$(O) Tools__ProjectLoader.$(H): Tools__ProjectLoader.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)Tools__SearchDialog.$(O) Tools__SearchDialog.$(H): Tools__SearchDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(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) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(STCHDR)
+$(OUTDIR)Tools__SearchDialog.$(O) Tools__SearchDialog.$(H): Tools__SearchDialog.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\ModalBox.$(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) $(INCLUDE_TOP)\stx\libwidg\DialogBox.$(H) $(STCHDR)
 $(OUTDIR)Tools__SmalltalkDiffTool.$(O) Tools__SmalltalkDiffTool.$(H): Tools__SmalltalkDiffTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__SourceCodeManagerConfigurationTestTool.$(O) Tools__SourceCodeManagerConfigurationTestTool.$(H): Tools__SourceCodeManagerConfigurationTestTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__SpecialCodeView.$(O) Tools__SpecialCodeView.$(H): Tools__SpecialCodeView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__StringSearchTool.$(O) Tools__StringSearchTool.$(H): Tools__StringSearchTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__Tag.$(O) Tools__Tag.$(H): Tools__Tag.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__TagList.$(O) Tools__TagList.$(H): Tools__TagList.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(STCHDR)
-$(OUTDIR)Tools__TagsBrowser.$(O) Tools__TagsBrowser.$(H): Tools__TagsBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
+$(OUTDIR)Tools__TagsBrowser.$(O) Tools__TagsBrowser.$(H): Tools__TagsBrowser.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) $(INCLUDE_TOP)\stx\libwidg2\ListModelView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SelectionInListModelView.$(H) $(STCHDR)
 $(OUTDIR)Tools__TextDiffTool.$(O) Tools__TextDiffTool.$(H): Tools__TextDiffTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__TextMergeInfo.$(O) Tools__TextMergeInfo.$(H): Tools__TextMergeInfo.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__Toolbox.$(O) Tools__Toolbox.$(H): Tools__Toolbox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)Tools__WebBrowserPage.$(O) Tools__WebBrowserPage.$(H): Tools__WebBrowserPage.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)VersionDiffBrowser.$(O) VersionDiffBrowser.$(H): VersionDiffBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(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) $(STCHDR)
-$(OUTDIR)ViewWithAcceptAndCancelBar.$(O) ViewWithAcceptAndCancelBar.$(H): ViewWithAcceptAndCancelBar.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libview\View.$(H) $(INCLUDE_TOP)\stx\libwidg\Button.$(H) $(INCLUDE_TOP)\stx\libwidg\Label.$(H) $(STCHDR)
+$(OUTDIR)ViewWithAcceptAndCancelBar.$(O) ViewWithAcceptAndCancelBar.$(H): ViewWithAcceptAndCancelBar.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\Button.$(H) $(INCLUDE_TOP)\stx\libwidg\Label.$(H) $(STCHDR)
 $(OUTDIR)Win32FileDialog.$(O) Win32FileDialog.$(H): Win32FileDialog.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
 $(OUTDIR)stx_libtool.$(O) stx_libtool.$(H): stx_libtool.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)AbstractDirectoryBrowser.$(O) AbstractDirectoryBrowser.$(H): AbstractDirectoryBrowser.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)AbstractFileFinderApplicationComponent.$(O) AbstractFileFinderApplicationComponent.$(H): AbstractFileFinderApplicationComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)AbstractSourceCodeManagementSettingsAppl.$(O) AbstractSourceCodeManagementSettingsAppl.$(H): AbstractSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)BookmarkMenuBuilder.$(O) BookmarkMenuBuilder.$(H): BookmarkMenuBuilder.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\BookmarkVisitor.$(H) $(STCHDR)
-$(OUTDIR)ClassInspectorView.$(O) ClassInspectorView.$(H): ClassInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
-$(OUTDIR)ContextInspectorView.$(O) ContextInspectorView.$(H): ContextInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
-$(OUTDIR)DictionaryInspectorView.$(O) DictionaryInspectorView.$(H): DictionaryInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)ClassInspectorView.$(O) ClassInspectorView.$(H): ClassInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)ContextInspectorView.$(O) ContextInspectorView.$(H): ContextInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)DictionaryInspectorView.$(O) DictionaryInspectorView.$(H): DictionaryInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
 $(OUTDIR)Diff3ExclusiveVisitor.$(O) Diff3ExclusiveVisitor.$(H): Diff3ExclusiveVisitor.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Diff3InclusiveVisitor.$(H) $(STCHDR)
-$(OUTDIR)DiffCodeView.$(O) DiffCodeView.$(H): DiffCodeView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\DiffTextView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)DiffCodeView.$(O) DiffCodeView.$(H): DiffCodeView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\DiffTextView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
 $(OUTDIR)FileApplicationNoteBook.$(O) FileApplicationNoteBook.$(H): FileApplicationNoteBook.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2.$(O) FileBrowserV2.$(H): FileBrowserV2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV2SettingsAppl.$(O) FileBrowserV2SettingsAppl.$(H): FileBrowserV2SettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)FileDialogWithPreview.$(O) FileDialogWithPreview.$(H): FileDialogWithPreview.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\FileDialog.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\SimpleDialog.$(H) $(STCHDR)
-$(OUTDIR)ImageInspectorView.$(O) ImageInspectorView.$(H): ImageInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)ImageInspectorView.$(O) ImageInspectorView.$(H): ImageInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
 $(OUTDIR)NewLauncher.$(O) NewLauncher.$(H): NewLauncher.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractLauncherApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libview2\ToolApplicationModel.$(H) $(STCHDR)
-$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)OrderedCollectionInspectorView.$(O) OrderedCollectionInspectorView.$(H): OrderedCollectionInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
 $(OUTDIR)ParseTreeIndex.$(O) ParseTreeIndex.$(H): ParseTreeIndex.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SortedCollection.$(H) $(INCLUDE_TOP)\stx\libtool\SyntaxElement.$(H) $(STCHDR)
-$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
+$(OUTDIR)SetInspectorView.$(O) SetInspectorView.$(H): SetInspectorView.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\InspectorView.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(STCHDR)
 $(OUTDIR)SettingsDialog.$(O) SettingsDialog.$(H): SettingsDialog.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic2\List.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(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) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalItemWithLabelAndIcon.$(H) $(INCLUDE_TOP)\stx\libwidg2\HierarchicalList.$(H) $(STCHDR)
 $(OUTDIR)SmalltalkCodeGeneratorTool.$(O) SmalltalkCodeGeneratorTool.$(H): SmalltalkCodeGeneratorTool.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\CodeGeneratorTool.$(H) $(STCHDR)
 $(OUTDIR)SyntaxElementVariable.$(O) SyntaxElementVariable.$(H): SyntaxElementVariable.st $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\SyntaxElement.$(H) $(STCHDR)
@@ -207,8 +207,8 @@
 $(OUTDIR)Tools__CodeCompletionService.$(O) Tools__CodeCompletionService.$(H): Tools__CodeCompletionService.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(STCHDR)
 $(OUTDIR)Tools__CodeNavigationService.$(O) Tools__CodeNavigationService.$(H): Tools__CodeNavigationService.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__CodeViewService.$(H) $(STCHDR)
 $(OUTDIR)Tools__CodeView2SettingsAppl.$(O) Tools__CodeView2SettingsAppl.$(H): Tools__CodeView2SettingsAppl.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
-$(OUTDIR)Tools__Diff2CodeView2.$(O) Tools__Diff2CodeView2.$(H): Tools__Diff2CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__DiffCodeView2.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
-$(OUTDIR)Tools__Diff3CodeView2.$(O) Tools__Diff3CodeView2.$(H): Tools__Diff3CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__DiffCodeView2.$(H) $(INCLUDE_TOP)\stx\libview\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)Tools__Diff2CodeView2.$(O) Tools__Diff2CodeView2.$(H): Tools__Diff2CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__DiffCodeView2.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
+$(OUTDIR)Tools__Diff3CodeView2.$(O) Tools__Diff3CodeView2.$(H): Tools__Diff3CodeView2.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__DiffCodeView2.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsMedium.$(H) $(INCLUDE_TOP)\stx\libview\SimpleView.$(H) $(INCLUDE_TOP)\stx\libwidg2\SyncedMultiColumnTextView.$(H) $(INCLUDE_TOP)\stx\libwidg2\TwoColumnTextView.$(H) $(STCHDR)
 $(OUTDIR)Tools__FontSettingsApplication.$(O) Tools__FontSettingsApplication.$(H): Tools__FontSettingsApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
 $(OUTDIR)Tools__GenericToolbox.$(O) Tools__GenericToolbox.$(H): Tools__GenericToolbox.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\Tools__Toolbox.$(H) $(STCHDR)
 $(OUTDIR)Tools__LintRuleSettingsApplication.$(O) Tools__LintRuleSettingsApplication.$(H): Tools__LintRuleSettingsApplication.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(STCHDR)
@@ -263,6 +263,15 @@
 $(OUTDIR)Tools__HierarchicalChangeList.$(O) 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.$(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.$(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\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\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Point.$(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\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\String.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(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\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\DeviceGraphicsContext.$(H) $(INCLUDE_TOP)\stx\libview\DisplaySurface.$(H) $(INCLUDE_TOP)\stx\libview\Form.$(H) $(INCLUDE_TOP)\stx\libview\GraphicsContext.$(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\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\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\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\Notification.$(H) $(INCLUDE_TOP)\stx\libbasic\Number.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Point.$(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\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\String.$(H) $(INCLUDE_TOP)\stx\libbasic\StringCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Symbol.$(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\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\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
+
+# **Must be at end**
+
+# Enforce recompilation of package definition class if Mercurial working
+# copy state changes. Together with --guessVersion it ensures that package
+# definition class always contains correct binary revision string.
+!IFDEF HGROOT
+$(OUTDIR)stx_libtool.$(O): $(HGROOT)\.hg\dirstate
+!ENDIF
--- a/bmake.bat	Fri Nov 13 06:40:27 2015 +0100
+++ b/bmake.bat	Mon Nov 16 13:33:19 2015 +0000
@@ -4,6 +4,9 @@
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
 @SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
 make.exe -N -f bc.mak  %DEFINES% %*
 
--- a/extensions.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/extensions.st	Mon Nov 16 13:33:19 2015 +0000
@@ -2793,14 +2793,7 @@
 
 !stx_libtool class methodsFor:'documentation'!
 
-extensionsVersion_CVS
-    ^ '$Header$'
-! !
-
-!stx_libtool class methodsFor:'documentation'!
-
 extensionsVersion_HG
 
     ^ '$Changeset: <not expanded> $'
 ! !
-
--- a/mingwmake.bat	Fri Nov 13 06:40:27 2015 +0100
+++ b/mingwmake.bat	Mon Nov 16 13:33:19 2015 +0000
@@ -4,6 +4,9 @@
 @REM do not edit - automatically generated from ProjectDefinition
 @REM -------
 @SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
 @pushd ..\rules
 @call find_mingw.bat
--- a/stx_libtool.st	Fri Nov 13 06:40:27 2015 +0100
+++ b/stx_libtool.st	Mon Nov 16 13:33:19 2015 +0000
@@ -136,7 +136,7 @@
         #'stx:libview'    "AbstractBackground - superclass of DiffTextView::DiffTextScrollerBackground"
         #'stx:libview2'    "ApplicationModel - superclass of AbstractDirectoryBrowser"
         #'stx:libwidg'    "Button - superclass of ViewWithAcceptAndCancelBar::AcceptAndCancelBar::ButtonWithHelpText"
-        #'stx:libwidg2'    "ComboBoxView - superclass of FilenameEditFieldV2"
+        #'stx:libwidg2'    "AbstractHierarchicalItem - superclass of Bookmark"
     )
 !
 
@@ -196,6 +196,8 @@
         AbstractFileBrowser
         AbstractLauncherApplication
         AbstractSettingsApplication
+        (AbstractVersionDiffBrowserItem autoload)
+        (ApplicationBuilder autoload)
         Bookmark
         BookmarkBar
         BookmarkEditor
@@ -205,9 +207,12 @@
         BookmarksEditDialog
         BrowserView
         ChangesBrowser
+        (ClassNameItem autoload)
+        (ClassRevisionTree autoload)
         CodeCompletionHelpMenuView
         CodeCompletionHelpView
         CodeGenerator
+        (CodeGeneratorTests autoload)
         CodeGeneratorTool
         DebugView
         Diff
@@ -218,24 +223,37 @@
         Diff3TextView
         DiffListUtility
         DiffTextView
+        (EWorldIconLibrary autoload)
         EditFieldWithCompletion
         EditFieldWithCompletionSpec
+        (EventMonitor autoload)
         FileBrowser
         FileBrowserV2PanelView
+        (FileBrowserV2SettingsDialog autoload)
+        (FileBrowserV2Tests autoload)
         FileBrowserV2UISpecifications
         FileDialog
+        (FileDialogV2 autoload)
         FileOperation
         FilenameEditFieldV2
+        (HierarchicalClassRevisionList autoload)
+        (HierarchicalVersionDiffBrowser autoload)
         InspectorView
         MemoryMonitor
         MemoryMonitorView
         MemoryUsageView
         MultiViewToolApplication
+        (NewChangesBrowser autoload)
+        (OldLauncher autoload)
         PerforceSourceCodeManagerUtilities
         ProcessMonitorV2
+        (ProjectView autoload)
+        (RCSConflictEditTextView autoload)
         SyntaxElement
         SyntaxHighlighter2
         SystemBrowser
+        (SystemStatusMonitor autoload)
+        (TextDiffTests autoload)
         #'Tools::AbstractTestRunner'
         #'Tools::BreakpointBrowser'
         #'Tools::Browslet'
@@ -252,8 +270,10 @@
         #'Tools::CodeCompletionMenu'
         #'Tools::CodeCritics'
         #'Tools::CodeView2'
+        (#'Tools::CodeView2DemoApp' autoload)
         #'Tools::CodeViewService'
         #'Tools::DiffCodeView2'
+        (#'Tools::DiffCodeView2DemoApp' autoload)
         #'Tools::HierarchicalChangesetDialog'
         #'Tools::InlineMessageDialog'
         #'Tools::Inspector2'
@@ -266,6 +286,7 @@
         #'Tools::MethodCategoryCache'
         #'Tools::MethodRewriter'
         #'Tools::NavigationHistory'
+        (#'Tools::NavigationHistoryTests' autoload)
         #'Tools::NavigationState'
         #'Tools::NavigatorModel'
         #'Tools::NewClassWizardDialog'
@@ -285,17 +306,27 @@
         #'Tools::TagsBrowser'
         #'Tools::TextDiffTool'
         #'Tools::TextMergeInfo'
+        (#'Tools::ToDoList' autoload)
+        (#'Tools::ToDoListBrowser' autoload)
+        (#'Tools::ToDoListEntry' autoload)
+        (#'Tools::ToDoNotification' autoload)
         #'Tools::Toolbox'
         #'Tools::WebBrowserPage'
         VersionDiffBrowser
         ViewWithAcceptAndCancelBar
         Win32FileDialog
+        (XTermView autoload)
         #'stx_libtool'
         AbstractDirectoryBrowser
         AbstractFileFinderApplicationComponent
+        (AbstractRevisionItem autoload)
         AbstractSourceCodeManagementSettingsAppl
         BookmarkMenuBuilder
+        (ChangeSetBrowser autoload)
         ClassInspectorView
+        (ClassItem autoload)
+        (ClassItemRoot autoload)
+        (ColorInspectorView autoload)
         ContextInspectorView
         DictionaryInspectorView
         Diff3ExclusiveVisitor
@@ -305,19 +336,25 @@
         FileBrowserV2SettingsAppl
         FileDialogWithPreview
         ImageInspectorView
+        (Launcher autoload)
+        (LibraryBuilder autoload)
         NewLauncher
         OrderedCollectionInspectorView
         ParseTreeIndex
+        (ProcessMonitor autoload)
+        (SemaphoreMonitor autoload)
         SetInspectorView
         SettingsDialog
         SmalltalkCodeGeneratorTool
         SyntaxElementVariable
+        (TerminalApplication autoload)
         #'Tools::BackgroundSourceProcessingService'
         #'Tools::BreakpointService'
         #'Tools::BrowserList'
         #'Tools::CodeCompletionService'
         #'Tools::CodeNavigationService'
         #'Tools::CodeView2SettingsAppl'
+        (#'Tools::CompilerWarningToDoListEntry' autoload)
         #'Tools::Diff2CodeView2'
         #'Tools::Diff3CodeView2'
         #'Tools::FontSettingsApplication'
@@ -328,6 +365,7 @@
         #'Tools::NewSystemBrowser'
         #'Tools::OrganizerCanvas'
         #'Tools::SendersBrowslet'
+        (#'Tools::SmalltalkMergeTool' autoload)
         #'Tools::StringSearchToolForTextView'
         #'Tools::TestRunnerMini'
         #'Tools::TextDiff2Tool'
@@ -337,15 +375,19 @@
         BookmarkAddMenuBuilder
         BookmarkToolbarMenuBuilder
         CVSSourceCodeManagementSettingsAppl
+        (ClassItemRootForRevision autoload)
         DataBaseSourceCodeManagementSettingsAppl
         DirectoryContentsBrowser
         DirectoryDifferenceViewApplication
         DirectoryTreeBrowser
+        (ExpandableRevisionItem autoload)
         FileBasedSourceCodeManagementSettingsAppl
         FindFileApplication
         GitSourceCodeManagementSettingsAppl
         MercurialSourceCodeManagementSettingsAppl
         PerforceSourceCodeManagementSettingsAppl
+        (SmalltalkInspectorView autoload)
+        (SourceRevisionItem autoload)
         StoreSourceCodeManagementSettingsAppl
         #'Tools::BrowserListWithFilter'
         #'Tools::ClassCategoryList'
@@ -360,6 +402,8 @@
         #'Tools::SmalltalkToolbox'
         #'Tools::TestRunnerEmbedded'
         #'Tools::VariableList'
+        (VersionRevisionItem autoload)
+        (ClassVariablesInspectorView autoload)
         #'Tools::ChangeList'
         #'Tools::ChangeSetDiffList'
         #'Tools::FullMethodCategoryList'
@@ -374,56 +418,12 @@
         #'Tools::HierarchicalChangeList'
         #'Tools::HierarchicalPackageFilterList'
         #'Tools::InheritanceClassList'
-        (ChangeSetBrowser autoload)
-        (ColorInspectorView autoload)
-        (NewChangesBrowser autoload)
-        (XTermView autoload)
-        (AbstractVersionDiffBrowserItem autoload)
-        (ApplicationBuilder autoload)
-        (ClassNameItem autoload)
-        (ClassRevisionTree autoload)
-        (CodeGeneratorTests autoload)
-        (EWorldIconLibrary autoload)
-        (EventMonitor autoload)
-        (FileBrowserV2SettingsDialog autoload)
-        (FileBrowserV2Tests autoload)
-        (FileDialogV2 autoload)
-        (HierarchicalClassRevisionList autoload)
-        (HierarchicalVersionDiffBrowser autoload)
-        (OldLauncher autoload)
-        (ProjectView autoload)
-        (RCSConflictEditTextView autoload)
-        (SystemStatusMonitor autoload)
-        (TextDiffTests autoload)
-        (#'Tools::CodeView2DemoApp' autoload)
-        (#'Tools::DiffCodeView2DemoApp' autoload)
-        (#'Tools::NavigationHistoryTests' autoload)
-        (#'Tools::ToDoList' autoload)
-        (#'Tools::ToDoListBrowser' autoload)
-        (#'Tools::ToDoListEntry' autoload)
-        (#'Tools::ToDoNotification' autoload)
-        (AbstractRevisionItem autoload)
-        (ClassItem autoload)
-        (ClassItemRoot autoload)
-        (Launcher autoload)
-        (LibraryBuilder autoload)
-        (ProcessMonitor autoload)
-        (SemaphoreMonitor autoload)
-        (TerminalApplication autoload)
-        (#'Tools::CompilerWarningToDoListEntry' autoload)
-        (#'Tools::SmalltalkMergeTool' autoload)
-        (ClassItemRootForRevision autoload)
-        (ExpandableRevisionItem autoload)
-        (SmalltalkInspectorView autoload)
-        (SourceRevisionItem autoload)
-        (VersionRevisionItem autoload)
-        (ClassVariablesInspectorView autoload)
     )
 !
 
 extensionMethodNames
-    "lists the extension methods which are to be included in the project.
-     Entries are pairwise elements, consisting of class-name and selector."
+    "list class/selector pairs of extensions.
+     A correponding method with real names must be present in my concrete subclasses"
 
     ^ #(
         Breakpoint icon
@@ -656,5 +656,9 @@
 
 version_CVS
     ^ '$Header$'
+!
+
+version_HG
+    ^ '$Changeset: <not expanded> $'
 ! !
 
--- a/vcmake.bat	Fri Nov 13 06:40:27 2015 +0100
+++ b/vcmake.bat	Mon Nov 16 13:33:19 2015 +0000
@@ -10,6 +10,10 @@
     popd
 )
 @SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
+
 
 make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*