Title: [172079] branches/safari-600.1-branch/Source/_javascript_Core
- Revision
- 172079
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:21:31 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171949. <rdar://problem/17474290>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog (172078 => 172079)
--- branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-08-05 21:19:13 UTC (rev 172078)
+++ branches/safari-600.1-branch/Source/_javascript_Core/ChangeLog 2014-08-05 21:21:31 UTC (rev 172079)
@@ -1,5 +1,15 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171949
+
+ 2014-08-01 Csaba Osztrogonác <o...@webkit.org>
+
+ URTBF after r171946 to fix non-Apple builds.
+
+ * bytecode/InlineCallFrameSet.cpp:
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171946
2014-08-01 Mark Hahnenberg <mhahnenb...@apple.com>
Modified: branches/safari-600.1-branch/Source/_javascript_Core/bytecode/InlineCallFrameSet.cpp (172078 => 172079)
--- branches/safari-600.1-branch/Source/_javascript_Core/bytecode/InlineCallFrameSet.cpp 2014-08-05 21:19:13 UTC (rev 172078)
+++ branches/safari-600.1-branch/Source/_javascript_Core/bytecode/InlineCallFrameSet.cpp 2014-08-05 21:21:31 UTC (rev 172079)
@@ -25,6 +25,7 @@
#include "config.h"
#include "InlineCallFrameSet.h"
+#include "JSCInlines.h"
namespace JSC {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes