Title: [163403] trunk/Source/_javascript_Core/ChangeLog
- Revision
- 163403
- Author
- [email protected]
- Date
- 2014-02-04 14:22:04 -0800 (Tue, 04 Feb 2014)
Log Message
Remove conflict markers from ChangeLog
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (163402 => 163403)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-04 21:52:25 UTC (rev 163402)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-04 22:22:04 UTC (rev 163403)
@@ -63,7 +63,6 @@
2014-02-04 Mark Hahnenberg <[email protected]>
-<<<<<<< .mine
JSC needs to be able to parse DWARF debug_line info
https://bugs.webkit.org/show_bug.cgi?id=127394
@@ -96,7 +95,6 @@
2014-02-04 Mark Hahnenberg <[email protected]>
-=======
ASSERT in speculateMachineInt on 32-bit platforms
https://bugs.webkit.org/show_bug.cgi?id=128155
@@ -107,7 +105,6 @@
2014-02-04 Mark Hahnenberg <[email protected]>
->>>>>>> .r163396
GC timer should always do a FullCollection
https://bugs.webkit.org/show_bug.cgi?id=128186
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
