Merge jv
authorMerge Script
Thu, 07 Apr 2016 07:08:20 +0200
branchjv
changeset 1009 e25edee0d1e7
parent 1006 0d3b402c4d6c (current diff)
parent 1008 c9cdc9559304 (diff)
child 1013 c8d5daf7e166
Merge
MCPackage.st
--- a/.hgtags	Sun Mar 27 00:40:37 2016 +0000
+++ b/.hgtags	Thu Apr 07 07:08:20 2016 +0200
@@ -2,7 +2,16 @@
 10d134daf6fdb8cd541eaa040027b5228ea45b53 expecco_2_4_0
 10d134daf6fdb8cd541eaa040027b5228ea45b53 expecco_2_4_1
 2cdc9be3bc681e73abe2356c893761bc55cbb4c1 stx_6_2_2
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_0
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_0_45_windows_final
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_0_49_windows_final
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_0rc1
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_1
+2e49dd573eafb2f7ed5724feb7c7041640c2bd48 expecco_2_6_2
 5172fd274198d23167a7a918998e60145ea0d133 expecco_2_1_0
+57dcb488ff87fbb8b06c175424ee03ded925af1f expecco_2_5_0
+57dcb488ff87fbb8b06c175424ee03ded925af1f expecco_2_5_1
+57dcb488ff87fbb8b06c175424ee03ded925af1f stable
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expeccoNET_1_4_0rc1
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expecco_1_0_3
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expecco_1_3_4
@@ -20,31 +29,29 @@
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expecco_1_7_1rc2
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expecco_1_7_1rc3
 6eea73c5dc65b226a20ac72e353c304dc9cbcb0e expecco_1_7_1rc4
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_0
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_0_45_windows_final
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_0_49_windows_final
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_0rc1
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_1
-728e7cbc9af0193625729add6a27a839d250f788 expecco_2_6_2
+9d3047664305fd9d450e386b28e6eced4dad321c expeccoALM_1_9_0_1
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_2_8_0
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_2_8_0a
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_2_8_0b
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_ALM_1_9_5
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_ALM_1_9_6
+9d3047664305fd9d450e386b28e6eced4dad321c expecco_ALM_1_9_7
 c26ad17d4dc722e39b6858c520fc545b85711288 expeccoNET_1_5_0rc1
 c26ad17d4dc722e39b6858c520fc545b85711288 expeccoNET_1_5_1rc1
 c26ad17d4dc722e39b6858c520fc545b85711288 expecco_1_7_2rc1
 c26ad17d4dc722e39b6858c520fc545b85711288 expecco_1_8_0rc1
 c26ad17d4dc722e39b6858c520fc545b85711288 expecco_1_8_2rc1
 c26ad17d4dc722e39b6858c520fc545b85711288 rel5_4_6
-c3bd562c4050bd278cc7671ba7887da1d59a1bfe expecco_2_5_0
-c3bd562c4050bd278cc7671ba7887da1d59a1bfe expecco_2_5_1
-c3bd562c4050bd278cc7671ba7887da1d59a1bfe stable
+c4564a0396b953d6d1c00c84077ef0bfd9765c9d expecco_2_7_0
+c4564a0396b953d6d1c00c84077ef0bfd9765c9d expecco_2_7_0_49
+c4564a0396b953d6d1c00c84077ef0bfd9765c9d expecco_2_7_5
+c4564a0396b953d6d1c00c84077ef0bfd9765c9d expecco_2_7_5a
 d48401867000b9f6bef4e24830824fe18e13df25 expeccoNET_1_7_0_0
 d48401867000b9f6bef4e24830824fe18e13df25 expecco_2_2_0
 d48401867000b9f6bef4e24830824fe18e13df25 expecco_2_2_5
 df7c75f6b01f34f4ce24caee8d050af681306e49 initialR
-f544f968df1de1988a4014e5a373684d74374cea expecco_2_7_0
-f544f968df1de1988a4014e5a373684d74374cea expecco_2_7_0_49
-f544f968df1de1988a4014e5a373684d74374cea expecco_2_7_5
 f546c4765ca4c0c1e825fbf4c0703fb90f559268 expeccoNET_1_6_0_0
 f546c4765ca4c0c1e825fbf4c0703fb90f559268 expeccoNET_1_6_8_0
 f546c4765ca4c0c1e825fbf4c0703fb90f559268 expecco_1_9_1_iX
 f546c4765ca4c0c1e825fbf4c0703fb90f559268 expecco_2_0_0
 f546c4765ca4c0c1e825fbf4c0703fb90f559268 expecco_2_0_0_0
-f95b01954348885223b1aa7b642e876b103d4acc expeccoALM_1_9_0_1
--- a/MCPackage.st	Sun Mar 27 00:40:37 2016 +0000
+++ b/MCPackage.st	Thu Apr 07 07:08:20 2016 +0200
@@ -1,5 +1,7 @@
 "{ Package: 'stx:goodies/monticello' }"
 
+"{ NameSpace: Smalltalk }"
+
 Object subclass:#MCPackage
 	instanceVariableNames:'name'
 	classVariableNames:''
@@ -126,14 +128,14 @@
 !MCPackage class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackage.st,v 1.17 2014-03-27 20:44:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/goodies/monticello/MCPackage.st,v 1.17 2014-03-27 20:44:08 cg Exp $'
+    ^ '$Header$'
 !
 
 version_SVN
-    ^ '$Id: MCPackage.st,v 1.17 2014-03-27 20:44:08 cg Exp $'
+    ^ '$Id$'
 ! !