Merge jv
authorMerge Script
Fri, 29 Jul 2016 06:57:19 +0200
branchjv
changeset 16764 ecd1c24daeeb
parent 16760 6ce6b708f34d (current diff)
parent 16763 54beb079381d (diff)
child 16772 ff05b9e59561
Merge
BookmarkList.st
Tools__BackgroundSourceProcessingService.st
Tools__CodeHighlightingService.st
--- a/BookmarkList.st	Thu Jul 28 06:49:35 2016 +0200
+++ b/BookmarkList.st	Fri Jul 29 06:57:19 2016 +0200
@@ -25,6 +25,8 @@
 "
 "{ Package: 'stx:libtool' }"
 
+"{ NameSpace: Smalltalk }"
+
 HierarchicalList subclass:#BookmarkList
 	instanceVariableNames:'fileName'
 	classVariableNames:'BrowserBookmarks WorkspaceBookmarks WebBookmarks FileBookmarks'
@@ -362,7 +364,7 @@
     "Modified: / 23-05-2011 / 13:56:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!BookmarkList methodsFor:'loading / saving'!
+!BookmarkList methodsFor:'loading & saving'!
 
 save
     |f|
@@ -396,14 +398,14 @@
 !BookmarkList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/BookmarkList.st,v 1.9 2014-11-04 11:14:25 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/BookmarkList.st,v 1.9 2014-11-04 11:14:25 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: BookmarkList.st,v 1.9 2014-11-04 11:14:25 cg Exp $'
+    ^ '$Id$'
 ! !
 
--- a/Tools__BackgroundSourceProcessingService.st	Thu Jul 28 06:49:35 2016 +0200
+++ b/Tools__BackgroundSourceProcessingService.st	Fri Jul 29 06:57:19 2016 +0200
@@ -64,7 +64,7 @@
     "Created: / 24-01-2012 / 12:27:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!BackgroundSourceProcessingService methodsFor:'acessing-defaults'!
+!BackgroundSourceProcessingService methodsFor:'accessing-defaults'!
 
 defaultJobName
     "Returns a human-readable job name, to ease identification in process browser"
--- a/Tools__CodeHighlightingService.st	Thu Jul 28 06:49:35 2016 +0200
+++ b/Tools__CodeHighlightingService.st	Fri Jul 29 06:57:19 2016 +0200
@@ -165,7 +165,7 @@
     "Modified: / 27-11-2014 / 15:42:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!CodeHighlightingService methodsFor:'acessing-defaults'!
+!CodeHighlightingService methodsFor:'accessing-defaults'!
 
 defaultJobName