diff options
Diffstat (limited to 'WebCore/Android.derived.v8bindings.mk')
| -rw-r--r-- | WebCore/Android.derived.v8bindings.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk index 12e12d2..efdf73e 100644 --- a/WebCore/Android.derived.v8bindings.mk +++ b/WebCore/Android.derived.v8bindings.mk @@ -146,6 +146,12 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates) GEN := \ $(intermediates)/bindings/V8Blob.h \ $(intermediates)/bindings/V8BlobBuilder.h \ +<<<<<<< HEAD +======= + $(intermediates)/bindings/V8DOMTokenList.h \ + $(intermediates)/bindings/V8DataGridColumn.h \ + $(intermediates)/bindings/V8DataGridColumnList.h \ +>>>>>>> webkit.org at r68651 $(intermediates)/bindings/V8File.h \ $(intermediates)/bindings/V8FileError.h \ $(intermediates)/bindings/V8FileList.h \ |