| commit | 620baf26855c28308c9f409a4fa2ce046369063d | [log] [tgz] |
|---|---|---|
| author | piotrz <piotrzarzycki21@gmail.com> | Mon Oct 13 07:46:29 2014 +0200 |
| committer | piotrz <piotrzarzycki21@gmail.com> | Mon Oct 13 07:46:29 2014 +0200 |
| tree | 6e64b04c877e7047e59c728115ad25a1aa3138eb | |
| parent | 3a4075c0060b0402c904a7346cd5fea219d2d914 [diff] | |
| parent | 0ca7dea0f11535463cbaea24bbefd3bd49c17774 [diff] |
Merge branch 'FlexUnit4TestsTLF' into develop
diff --git a/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as b/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as index 34cc5e7..8a5e778 100644 --- a/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as +++ b/textLayout/src/flashx/textLayout/conversion/TextFieldHtmlImporter.as
@@ -829,7 +829,7 @@ parseChildrenUnderNewActiveFormatWithImpliedParaFormat (importer, xmlToParse, parent, newFormat); } - /** Parse the <b> formatting element + /** Parse the <s> formatting element * Calculates the new format to apply to _activeFormat and continues parsing down the hierarchy * @private */