Title: [125621] branches/safari-536.26-branch/Source/_javascript_Core
- Revision
- 125621
- Author
- [email protected]
- Date
- 2012-08-14 16:28:23 -0700 (Tue, 14 Aug 2012)
Log Message
Merged r124272. <rdar://problem/12002610>
Modified Paths
Diff
Modified: branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog (125620 => 125621)
--- branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog 2012-08-14 23:25:58 UTC (rev 125620)
+++ branches/safari-536.26-branch/Source/_javascript_Core/ChangeLog 2012-08-14 23:28:23 UTC (rev 125621)
@@ -1,5 +1,15 @@
2012-08-14 Lucas Forschler <[email protected]>
+ Merge r124272.
+
+ 2012-07-31 Sam Weinig <[email protected]>
+
+ Fix the Windows build.
+
+ * _javascript_Core.vcproj/_javascript_Core/_javascript_Core.def:
+
+2012-08-14 Lucas Forschler <[email protected]>
+
Merge r124268.
2012-07-31 Sam Weinig <[email protected]>
@@ -69175,3 +69185,4 @@
== Rolled over to ChangeLog-2011-02-16 ==
.
+.
Modified: branches/safari-536.26-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def (125620 => 125621)
--- branches/safari-536.26-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2012-08-14 23:25:58 UTC (rev 125620)
+++ branches/safari-536.26-branch/Source/_javascript_Core/_javascript_Core.vcproj/_javascript_Core/_javascript_Core.def 2012-08-14 23:28:23 UTC (rev 125621)
@@ -77,7 +77,7 @@
?byteCompile@Yarr@JSC@@YA?AV?$PassOwnPtr@UBytecodePattern@Yarr@JSC@@@WTF@@AAUYarrPattern@12@PAVBumpPointerAllocator@4@@Z
?byteSize@SourceProviderCache@JSC@@QBEIXZ
?calculateDSTOffset@WTF@@YANNN@Z
- ?calculateStringHashAndLengthFromUTF8@Unicode@WTF@@YAIPBD0AAI1@Z
+ ?calculateStringHashAndLengthFromUTF8MaskingTop8Bits@Unicode@WTF@@YAIPBD0AAI1@Z
?calculateUTCOffset@WTF@@YAHXZ
?calculatedFunctionName@DebuggerCallFrame@JSC@@QBE?AVUString@2@XZ
?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
