equal
deleted
inserted
replaced
7 inclusion of the above copyright notice. This software may not |
7 inclusion of the above copyright notice. This software may not |
8 be provided or otherwise made available to, or used by, any |
8 be provided or otherwise made available to, or used by, any |
9 other person. No title to or ownership of the software is |
9 other person. No title to or ownership of the software is |
10 hereby transferred. |
10 hereby transferred. |
11 " |
11 " |
12 |
|
13 |
|
14 "{ Package: 'stx:libtool' }" |
12 "{ Package: 'stx:libtool' }" |
15 |
13 |
16 EditTextView subclass:#RCSConflictEditTextView |
14 EditTextView subclass:#RCSConflictEditTextView |
17 instanceVariableNames:'' |
15 instanceVariableNames:'' |
18 classVariableNames:'' |
16 classVariableNames:'' |
152 ! ! |
150 ! ! |
153 |
151 |
154 !RCSConflictEditTextView class methodsFor:'documentation'! |
152 !RCSConflictEditTextView class methodsFor:'documentation'! |
155 |
153 |
156 version |
154 version |
157 ^ '$Header: /cvs/stx/stx/libtool/RCSConflictEditTextView.st,v 1.3 2006/07/05 07:42:02 fm Exp $' |
155 ^ '$Id: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
|
156 ! |
|
157 |
|
158 version_SVN |
|
159 ^ '$Id:: RCSConflictEditTextView.st 8016 2012-07-18 09:57:46Z vranyj1 $' |
158 ! ! |
160 ! ! |