Title: [131211] trunk/Source/WebCore/ChangeLog
- Revision
- 131211
- Author
- [email protected]
- Date
- 2012-10-12 12:34:41 -0700 (Fri, 12 Oct 2012)
Log Message
Unreviewed. Get rid of an accidental conflict marker in WebCore/ChangeLog.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131210 => 131211)
--- trunk/Source/WebCore/ChangeLog 2012-10-12 19:22:34 UTC (rev 131210)
+++ trunk/Source/WebCore/ChangeLog 2012-10-12 19:34:41 UTC (rev 131211)
@@ -4967,7 +4967,6 @@
* platform/graphics/skia/SimpleFontDataSkia.cpp:
(WebCore::SimpleFontData::canRenderCombiningCharacterSequence):
->>>>>>> .r131205
2012-10-09 Enrica Casucci <[email protected]>
Only measure text once instead of twice when performing line layout.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
