diff options
| author | Steve Block <steveblock@google.com> | 2010-01-19 15:00:28 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-19 15:00:48 +0000 |
| commit | 23a4578154c0507a6c2a42de452b3bcec971d0ed (patch) | |
| tree | fcc8e9db51e01a45cefa674f9b366b3819f63b8e /WebCore/bindings | |
| parent | 6f473cc5d35ac6beed6d8c4bafdb37a0639ee08e (diff) | |
| parent | df644d06988b2a2839113b5f4fc7b8dd1717d964 (diff) | |
| download | external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.zip external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.gz external_webkit-23a4578154c0507a6c2a42de452b3bcec971d0ed.tar.bz2 | |
resolved conflicts for merge of df644d06 to master
Change-Id: I02d6b5e94724091decfe0c26317554c86dcfb2da
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/js/ScriptControllerMac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bindings/js/ScriptControllerMac.mm b/WebCore/bindings/js/ScriptControllerMac.mm index 21ec0f2..7d3b267 100644 --- a/WebCore/bindings/js/ScriptControllerMac.mm +++ b/WebCore/bindings/js/ScriptControllerMac.mm @@ -51,7 +51,7 @@ #import "runtime.h" #if ENABLE(MAC_JAVA_BRIDGE) -#import "jni_instance.h" +#import "JavaInstanceJSC.h" #endif @interface NSObject (WebPlugin) |