Reviewed by Eric, Kevin and Geoff.

[WebKit-https.git] / JavaScriptCore / ChangeLog

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 4ab80327709301469e83ebf7aa4a2d32eef5293f..5226b5083f6cb8930b070d3ecb1d2f53fe261a1d 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-22  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Eric, Kevin and Geoff.
+
+        Merge open source build fixes. <rdar://problem/4555500>
+
+        * kjs/collector.cpp: look at the rsp register in x86_64 
+        (KJS::Collector::markOtherThreadConservatively):
+        * wtf/Platform.h: add x86_64 to the platform list
+
 2006-05-19  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Geoff.