Title: [124388] trunk/Source/_javascript_Core/ChangeLog
- Revision
- 124388
- Author
- [email protected]
- Date
- 2012-08-01 17:10:20 -0700 (Wed, 01 Aug 2012)
Log Message
Remove apparent merge goof from _javascript_Core/ChangeLog
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (124387 => 124388)
--- trunk/Source/_javascript_Core/ChangeLog 2012-08-01 23:57:24 UTC (rev 124387)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-08-02 00:10:20 UTC (rev 124388)
@@ -261,7 +261,6 @@
(MarkedBlock):
(JSC::MarkedBlock::capacity): Updated for encapsulation.
->>>>>>> .r124259
2012-07-31 Filip Pizlo <[email protected]>
DFG OSR exit profiling has unusual oversights
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
