diff options
| author | Steve Block <steveblock@google.com> | 2010-01-20 12:26:39 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-20 12:26:39 +0000 |
| commit | f94c3ecac24651c15569bdca42b311d0fc971861 (patch) | |
| tree | 3222cbe56cf10b82a93966f6eb01d4f6e50e0142 /WebCore/bridge/runtime_object.h | |
| parent | f5306da72ab6bb63f7ae07371e687f72a75c2fb2 (diff) | |
| parent | 3f4b1969e5c86f542a2b86118467a8fc8cec9c7c (diff) | |
| download | external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.zip external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.tar.gz external_webkit-f94c3ecac24651c15569bdca42b311d0fc971861.tar.bz2 | |
resolved conflicts for merge of 3f4b1969 to master
Change-Id: I24c41d6ab08dd3594edd4ff62a1c823c904b9851
Diffstat (limited to 'WebCore/bridge/runtime_object.h')
| -rw-r--r-- | WebCore/bridge/runtime_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bridge/runtime_object.h b/WebCore/bridge/runtime_object.h index 391e078..7d658fa 100644 --- a/WebCore/bridge/runtime_object.h +++ b/WebCore/bridge/runtime_object.h @@ -26,7 +26,7 @@ #ifndef KJS_RUNTIME_OBJECT_H #define KJS_RUNTIME_OBJECT_H -#include "runtime.h" +#include "Bridge.h" #include <runtime/JSGlobalObject.h> namespace JSC { |