diff options
Diffstat (limited to 'Source/WebCore/Android.derived.v8bindings.mk')
| -rw-r--r-- | Source/WebCore/Android.derived.v8bindings.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/WebCore/Android.derived.v8bindings.mk b/Source/WebCore/Android.derived.v8bindings.mk index 1612df9..0bee200 100644 --- a/Source/WebCore/Android.derived.v8bindings.mk +++ b/Source/WebCore/Android.derived.v8bindings.mk @@ -361,7 +361,12 @@ GEN := \ $(intermediates)/bindings/V8Navigator.h \ $(intermediates)/bindings/V8PositionError.h \ $(intermediates)/bindings/V8Screen.h \ +<<<<<<< HEAD $(intermediates)/bindings/V8SpeechInputEvent.h \ +======= + $(intermediates)/bindings/V8WebKitAnimation.h \ + $(intermediates)/bindings/V8WebKitAnimationList.h \ +>>>>>>> webkit.org at r82507 $(intermediates)/bindings/V8WebKitPoint.h \ $(intermediates)/bindings/V8WorkerNavigator.h $(GEN): PRIVATE_PATH := $(LOCAL_PATH) |