"Change Set:		showC-update-sr
Date:			7 June 2000
Author:			Stephan Rudlof

Functionality:
	- Solves conflicts between SqC updates until #2299 and the showC
changeset.

Precondition:
	- showC5.cs


Changed:

- Browser>>contents : conflict with SqC update, removed 'subclass
template' functionality -> merged;
- CCodeGenerator>>translateMethodClass : method was unchanged (but your
initials replaced them of the original author...) -> original method
restored;
- MethodNode>>asTranslationMethodOfClass: : -> original method restored;
- ParagraphEditor>>initializeShiftCmdKeyShortcuts: : conflict with SqC
update -> merged;
- ParagraphEditor>>initializeTextEditorMenus : conflict with SqC update
-> merged.
"
-- 
Stephan Rudlof (sr at evolgo.de)
   "Genius doesn't work on an assembly line basis.
    You can't simply say, 'Today I will be brilliant.'"
    -- Kirk, "The Ultimate Computer", stardate 4731.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: showC-update-sr.2.cs
Type: application/octet-stream
Size: 6536 bytes
Desc: not available
Url : http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20000607/6427faea/showC-update-sr.2.obj