diff -r 15f47901fb64 -r c0bdf75cfde5 Tools__TextDiffTool.st --- a/Tools__TextDiffTool.st Sat Mar 17 10:21:50 2012 +0000 +++ b/Tools__TextDiffTool.st Sat Mar 17 13:13:35 2012 +0000 @@ -84,6 +84,13 @@ ^ToolbarIconLibrary versionBase24x24 "Created: / 24-03-2010 / 20:50:42 / Jan Vrany " +! + +versionMerged24x24 + + ^ToolbarIconLibrary versionMerged24x24 + + "Created: / 17-03-2012 / 12:18:45 / Jan Vrany " ! ! !TextDiffTool class methodsFor:'interface specs'! @@ -770,5 +777,5 @@ !TextDiffTool class methodsFor:'documentation'! version_SVN - ^ '$Id: Tools__TextDiffTool.st 7936 2012-03-16 22:44:50Z vranyj1 $' + ^ '$Id: Tools__TextDiffTool.st 7939 2012-03-17 13:13:35Z vranyj1 $' ! !