--- a/Change.st Wed Aug 01 15:21:03 2012 +0100
+++ b/Change.st Wed Aug 01 18:38:51 2012 +0100
@@ -431,6 +431,14 @@
"Created: / 7.2.1998 / 19:26:50 / cg"
!
+isMethodChangeForCopyrightMethod
+ "Return true if this is a change of #copyright method"
+
+ ^ false
+
+ "Created: / 01-08-2012 / 16:34:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isMethodChangeForVersionMethod
"true if this is a method's code change (not package, category etc.)"
@@ -508,7 +516,7 @@
!Change class methodsFor:'documentation'!
version
- ^ '$Id: Change.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: Change.st 1952 2012-08-01 17:38:51Z vranyj1 $'
!
version_CVS
@@ -516,5 +524,5 @@
!
version_SVN
- ^ '$Id: Change.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: Change.st 1952 2012-08-01 17:38:51Z vranyj1 $'
! !
--- a/ChangeSetDiffComponent.st Wed Aug 01 15:21:03 2012 +0100
+++ b/ChangeSetDiffComponent.st Wed Aug 01 18:38:51 2012 +0100
@@ -217,6 +217,14 @@
!ChangeSetDiffComponent methodsFor:'testing'!
+isConflict
+ "Return true, if there is a conflict."
+
+ ^ self subclassResponsibility
+
+ "Modified (comment): / 01-08-2012 / 17:11:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isDiffItem
^ false
!
@@ -230,6 +238,13 @@
^false
!
+isForCopyrightMethod
+ "Returns true, if this is an entry for #copyright method"
+ ^self subclassResponsibility
+
+ "Created: / 01-08-2012 / 16:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isForVersionMethod
"Returns true, if this is an entry for version method"
^self subclassResponsibility
@@ -246,7 +261,7 @@
!ChangeSetDiffComponent class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSetDiffComponent.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffComponent.st 1952 2012-08-01 17:38:51Z vranyj1 $'
!
version_CVS
@@ -254,5 +269,5 @@
!
version_SVN
- ^ '$Id: ChangeSetDiffComponent.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffComponent.st 1952 2012-08-01 17:38:51Z vranyj1 $'
! !
--- a/ChangeSetDiffEntry.st Wed Aug 01 15:21:03 2012 +0100
+++ b/ChangeSetDiffEntry.st Wed Aug 01 18:38:51 2012 +0100
@@ -338,10 +338,38 @@
!ChangeSetDiffEntry methodsFor:'testing'!
+isConflict
+ "Return true, if there is a conflict. For simple two-way diff,
+ conflict is when there are both versionA and versionB and they
+ differ. For three-way diff/merge, conflict is iff the entry is not
+ yet merged"
+
+ ^versionBase isNil ifTrue:[
+ "/two-way diff
+ versionA notNil and:[versionB notNil and:[(versionA sameAs: versionB) not]]
+ ] ifFalse:[
+ self isMerged not
+ ].
+
+ "Created: / 01-08-2012 / 17:10:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isDiffItem
^ true
!
+isForCopyrightMethod
+ "Returns true, if this is an entry for version method"
+
+ | version |
+
+ version := versionA ? versionB.
+ ^version isMethodCodeChange
+ and:[version isForMeta and: [version selector == #copyright]]
+
+ "Created: / 01-08-2012 / 16:39:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isForVersionMethod
"Returns true, if this is an entry for version method"
@@ -349,7 +377,7 @@
version := versionA ? versionB.
^version isMethodCodeChange
- and:[AbstractSourceCodeManager isVersionMethodSelector: version selector]
+ and:[(AbstractSourceCodeManager isVersionMethodSelector: version selector) or:[AbstractSourceCodeManager isVersionMethodForExtensionsSelector: version selector]]
"Created: / 18-04-2012 / 18:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -371,7 +399,7 @@
!ChangeSetDiffEntry class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSetDiffEntry.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffEntry.st 1952 2012-08-01 17:38:51Z vranyj1 $'
!
version_CVS
@@ -379,5 +407,5 @@
!
version_SVN
- ^ '$Id: ChangeSetDiffEntry.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffEntry.st 1952 2012-08-01 17:38:51Z vranyj1 $'
! !
--- a/ChangeSetDiffSet.st Wed Aug 01 15:21:03 2012 +0100
+++ b/ChangeSetDiffSet.st Wed Aug 01 18:38:51 2012 +0100
@@ -226,6 +226,14 @@
!ChangeSetDiffSet methodsFor:'testing'!
+isConflict
+ "Return true, if there is a conflict."
+
+ ^ self diffs anySatisfy:[:e|e isConflict].
+
+ "Created: / 01-08-2012 / 17:10:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isDiffSet
^ true
!
@@ -238,6 +246,14 @@
"Modified: / 09-12-2009 / 17:43:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+isForCopyrightMethod
+ "Returns true, if this is an entry for #copyright method"
+
+ ^diffs allSatisfy:[:each|each isForCopyrightMethod]
+
+ "Created: / 01-08-2012 / 16:38:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isForVersionMethod
"Returns true, if this is an entry for version method"
@@ -257,7 +273,7 @@
!ChangeSetDiffSet class methodsFor:'documentation'!
version
- ^ '$Id: ChangeSetDiffSet.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffSet.st 1952 2012-08-01 17:38:51Z vranyj1 $'
!
version_CVS
@@ -265,5 +281,5 @@
!
version_SVN
- ^ '$Id: ChangeSetDiffSet.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: ChangeSetDiffSet.st 1952 2012-08-01 17:38:51Z vranyj1 $'
! !
--- a/Make.proto Wed Aug 01 15:21:03 2012 +0100
+++ b/Make.proto Wed Aug 01 18:38:51 2012 +0100
@@ -79,12 +79,15 @@
fi
stx_libbasic3.o: stx_libbasic3.st .svnversion
- if [ -d .svn ]; then \
+ @if [ -d .svn ]; then \
rev2="$(shell printf "%-16s" $$(cat .svnversion))"; \
+ echo " [SV] Expanding svnRevisionNo in $1.st"; \
sed -e "s/\"\$$SVN\-Revision:\".*\"\$$\"/\"\$$SVN-Revision:\"\'$$rev2\'\"\$$\"/g" $< > .stx_libbasic3.svn.st; \
fi
- $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic3.svn $(O_RULE);
- mv .stx_libbasic3.svn.$(O) stx_libbasic3.$(O)
+ $(MAKE) CC="$(CLASSLIB_CC)" OPT="$(OPT)" SEPINITCODE="$(SEPINITCODE)" STC="$(STC)" STFILE=.stx_libbasic3.svn $(C_RULE);
+ sed -i -e "s/\".stx_libbasic3.svn.st\");/\"\stx_libbasic3.st\");/g" .stx_libbasic3.svn.c
+ $(MAKE) .stx_libbasic3.svn.$(O)
+ @mv .stx_libbasic3.svn.$(O) stx_libbasic3.$(O)
endif
@@ -129,7 +132,7 @@
$(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)/stx/libbasic/OrderedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic/SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)/stx/libbasic/AbstractSourceFileWriter.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
@@ -165,7 +168,7 @@
$(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)/stx/libbasic3/ChangeNotificationParameter.$(H) $(INCLUDE_TOP)/stx/libbasic/Array.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)/stx/libbasic3/Change.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)/stx/libbasic3/AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProceedableError.$(H) $(INCLUDE_TOP)/stx/libbasic/Error.$(H) $(INCLUDE_TOP)/stx/libbasic/Exception.$(H) $(INCLUDE_TOP)/stx/libbasic/GenericException.$(H) $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(STCHDR)
$(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)/stx/libbasic3/VersionInfo.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)/stx/libbasic3/SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/MethodChange.st Wed Aug 01 15:21:03 2012 +0100
+++ b/MethodChange.st Wed Aug 01 18:38:51 2012 +0100
@@ -409,6 +409,12 @@
"Created: / 7.2.1998 / 19:26:59 / cg"
!
+isMethodChangeForCopyrightMethod
+ ^self isMethodCodeChange and: [ self isForMeta and: [ self selector == #copyright ] ]
+
+ "Created: / 01-08-2012 / 16:33:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
isMethodChangeForVersionMethod
^ self isMethodCodeChange
and:[ AbstractSourceCodeManager isVersionMethodSelector:self selector ]
@@ -453,7 +459,7 @@
!MethodChange class methodsFor:'documentation'!
version
- ^ '$Id: MethodChange.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: MethodChange.st 1952 2012-08-01 17:38:51Z vranyj1 $'
!
version_CVS
@@ -461,5 +467,5 @@
!
version_SVN
- ^ '$Id: MethodChange.st 1946 2012-07-31 14:00:47Z vranyj1 $'
+ ^ '$Id: MethodChange.st 1952 2012-08-01 17:38:51Z vranyj1 $'
! !
--- a/bc.mak Wed Aug 01 15:21:03 2012 +0100
+++ b/bc.mak Wed Aug 01 18:38:51 2012 +0100
@@ -71,7 +71,7 @@
$(OUTDIR)Change.$(O) Change.$(H): Change.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ChangeDeltaInformation.$(O) ChangeDeltaInformation.$(H): ChangeDeltaInformation.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ChangeNotificationParameter.$(O) ChangeNotificationParameter.$(H): ChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
+$(OUTDIR)ChangeSet.$(O) ChangeSet.$(H): ChangeSet.st $(INCLUDE_TOP)\stx\libbasic\OrderedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic\SmalltalkChunkFileSourceWriter.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractSourceFileWriter.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiff.$(O) ChangeSetDiff.$(H): ChangeSetDiff.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ChangeSetDiffComponent.$(O) ChangeSetDiffComponent.$(H): ChangeSetDiffComponent.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)ClassOrganizer.$(O) ClassOrganizer.$(H): ClassOrganizer.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
@@ -107,7 +107,7 @@
$(OUTDIR)MethodChangeNotificationParameter.$(O) MethodChangeNotificationParameter.$(H): MethodChangeNotificationParameter.st $(INCLUDE_TOP)\stx\libbasic3\ChangeNotificationParameter.$(H) $(INCLUDE_TOP)\stx\libbasic\Array.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)NameSpaceCreationChange.$(O) NameSpaceCreationChange.$(H): NameSpaceCreationChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)OtherChange.$(O) OtherChange.$(H): OtherChange.st $(INCLUDE_TOP)\stx\libbasic3\Change.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
-$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(STCHDR)
+$(OUTDIR)PerforceSourceCodeManager.$(O) PerforceSourceCodeManager.$(H): PerforceSourceCodeManager.st $(INCLUDE_TOP)\stx\libbasic3\AbstractSourceCodeManager.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProceedableError.$(H) $(INCLUDE_TOP)\stx\libbasic\Error.$(H) $(INCLUDE_TOP)\stx\libbasic\Exception.$(H) $(INCLUDE_TOP)\stx\libbasic\GenericException.$(H) $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(STCHDR)
$(OUTDIR)SVNVersionInfo.$(O) SVNVersionInfo.$(H): SVNVersionInfo.st $(INCLUDE_TOP)\stx\libbasic3\VersionInfo.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForContainerBasedManagers.$(O) SourceCodeManagerUtilitiesForContainerBasedManagers.$(H): SourceCodeManagerUtilitiesForContainerBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(O) SourceCodeManagerUtilitiesForWorkspaceBasedManagers.$(H): SourceCodeManagerUtilitiesForWorkspaceBasedManagers.st $(INCLUDE_TOP)\stx\libbasic3\SourceCodeManagerUtilities.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libbasic3.rc Wed Aug 01 15:21:03 2012 +0100
+++ b/libbasic3.rc Wed Aug 01 18:38:51 2012 +0100
@@ -3,7 +3,7 @@
// automagically generated from the projectDefinition: stx_libbasic3.
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,2,1942,1942
+ FILEVERSION 6,2,1946,1946
PRODUCTVERSION 6,2,2,1
#if (__BORLANDC__)
FILEFLAGSMASK VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +20,12 @@
BEGIN
VALUE "CompanyName", "eXept Software AG\0"
VALUE "FileDescription", "Smalltalk/X Additional Developer Basic Classes (LIB)\0"
- VALUE "FileVersion", "6.2.1942.1942\0"
+ VALUE "FileVersion", "6.2.1946.1946\0"
VALUE "InternalName", "stx:libbasic3\0"
VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2012\nCopyright eXept Software AG 1998-2012\0"
VALUE "ProductName", "Smalltalk/X\0"
VALUE "ProductVersion", "6.2.2.1\0"
- VALUE "ProductDate", "Tue, 31 Jul 2012 14:03:14 GMT\0"
+ VALUE "ProductDate", "Wed, 01 Aug 2012 17:42:59 GMT\0"
END
END