OSDN Git Service

Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cpp
authorSteve Block <steveblock@google.com>
Thu, 29 Apr 2010 13:30:19 +0000 (14:30 +0100)
committerSteve Block <steveblock@google.com>
Tue, 11 May 2010 13:42:14 +0000 (14:42 +0100)
commit0a06e7e772d95238accdb0139e5069b3e75091b1
tree7b5f409adc9dac5ac5eb66f265099ae196ecf547
parent01eb58e0c8da43223275f0eb2a1e4691125405d1
Merge webkit.org at r58033 : Fix conflicts in V8NavigatorCustom.cpp

This file has been deleted upstream now that more V8 bindings are
auto-generated, but we have local modifications, so we must keep these parts.

Change-Id: I0d1497bf3f54f977ef4753800b127a32f38a30ea
WebCore/Android.v8bindings.mk
WebCore/bindings/v8/custom/V8NavigatorCustom.cpp