Merge jv
authorMerge Script
Tue, 15 Dec 2015 07:10:10 +0100
branchjv
changeset 15989 f5bcfbde2c3d
parent 15986 df48308c20cf (current diff)
parent 15988 14e6d298902f (diff)
child 15992 34bf7ecb5e62
Merge
Tools__SearchDialog.st
--- a/.hgtags	Wed Dec 09 20:46:36 2015 +0000
+++ b/.hgtags	Tue Dec 15 07:10:10 2015 +0100
@@ -3,6 +3,8 @@
 01b72a80639e27cea5efb0a55b1c321f8f22904e expecco_2_6_0_45_windows_final
 020eb4c3034d9a3a2c672d722f67126aba34e13d expecco_2_6_2
 0345171682c483a27083e267891c5c409672b786 expecco_1_0_3
+0acdc2c63c1bcc0c704c4a6a587251fc3e04c559 expecco_ALM_1_9_5
+0acdc2c63c1bcc0c704c4a6a587251fc3e04c559 expecco_ALM_1_9_6
 0b1ad2518a5cd2c8273fb463e370af9d6abfbd97 expecco_2_1_0
 0b715d777c488bf60cadb45e1336e6191b713369 rel2_10_8_6_last2
 0b7d7aedc1cd27c9468db2e11b39e2d211556973 rel3_6_1
@@ -47,7 +49,6 @@
 94c64ad24577fdc86cbc80e55c5ca7ff502c094b expecco_2_4_0
 94c64ad24577fdc86cbc80e55c5ca7ff502c094b expecco_2_4_1
 94deec4857b143e0e8019495fe3f9383018e3629 expeccoNET_1_8_0_0
-9a3213bfdd683fb142defa192ce75717f91d59e7 expecco_ALM_1_9_5
 a20cb6fcb74bc09f91758268cdd0fdd708713be4 rel5_2_2
 a4117e5c784be3575cae7626d1c57cc7aeea1a26 expecco_2_2_0
 a8afd9424514ede465046961279e2442bc292089 rel5_4_6
--- a/Tools__SearchDialog.st	Wed Dec 09 20:46:36 2015 +0000
+++ b/Tools__SearchDialog.st	Tue Dec 15 07:10:10 2015 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2000 by eXept Software AG
 	      All Rights Reserved
@@ -73,6 +71,10 @@
 
 lastStringSearchArea
     ^ LastStringSearchArea
+!
+
+lastStringSearchArea:aSymbol
+    LastStringSearchArea := aSymbol
 ! !
 
 !SearchDialog methodsFor:'accessing'!
@@ -1450,11 +1452,11 @@
 !SearchDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.88 2015-04-21 14:59:24 cg Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.88 2015-04-21 14:59:24 cg Exp $'
+    ^ '$Header$'
 ! !