|FIX][ENH] Underline and Struck out for TrueType
ducasse at iam.unibe.ch
ducasse at iam.unibe.ch
Sat Sep 18 19:51:11 UTC 2004
Hi boris
could you check your changes against 3.8 unstable 6206.
Because there is a conflict.
Thanks
Stef
Checking CodeStyleFix.1.cs (#5923) for method conflicts with changesets
after The Worlds of Squeak ...
...checking TextMorph>>beAllFont:
...checking Preferences class>>fontConfigurationMenu
CONFLICT found for Preferences>>fontConfigurationMenu with newer
changesets 6111-0290fontMenuFixes-nk 6137-0322HaloFontInMenu-dgd
...checking CodeHolder>>buildMorphicCodePaneWith:
...checking Text>>unembellished
...checking Text class>>fromString:
1 conflict found.
More information about the Squeak-dev
mailing list
|