commit 2f6dfdf7db09444f8b5d6b5b1d3ad407a04553fd
author mrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu May 22 01:20:45 2008 +0000
committer mrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu May 22 01:20:45 2008 +0000
tree ec0a7378b4e14e2c4be2525c29671e3ed282153c
parent f3330d643101ce28a5145abbf7fa1b3039835aa1

Merge squirrelfish branch into trunk.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/kjs/AllInOneFile.cpp

diff --git a/JavaScriptCore/kjs/AllInOneFile.cpp b/JavaScriptCore/kjs/AllInOneFile.cpp
index 5144521..eb1d2b4 100644
--- a/JavaScriptCore/kjs/AllInOneFile.cpp
+++ b/JavaScriptCore/kjs/AllInOneFile.cpp
@@ -39,7 +39,6 @@
 #include "DateMath.cpp"
 #include "dtoa.cpp"
 #include "error_object.cpp"
-#include "ExecState.cpp"
 #include "function_object.cpp"
 #include "grammar.cpp"
 #include "identifier.cpp"
@@ -70,3 +69,5 @@
 #include "value.cpp"
 #include "wtf/FastMalloc.cpp"
 #include "wtf/TCSystemAlloc.cpp"
+#include "VM/CodeGenerator.cpp"
+#include "VM/RegisterFile.cpp"