diff options
Diffstat (limited to 'WebCore/Android.jscbindings.mk')
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index e87ca3d..bfa4d1d 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -86,10 +86,14 @@ LOCAL_SRC_FILES += \ bindings/js/JSDOMBinding.cpp \ bindings/js/JSDOMFormDataCustom.cpp \ bindings/js/JSDOMGlobalObject.cpp \ +<<<<<<< HEAD bindings/js/JSDOMMimeTypeArrayCustom.cpp \ bindings/js/JSDOMPluginArrayCustom.cpp \ bindings/js/JSDOMPluginCustom.cpp \ bindings/js/JSDOMStringMapCustom.cpp \ +======= + bindings/js/JSDOMTokenList.cpp \ +>>>>>>> webkit.org at r68651 bindings/js/JSDOMWindowBase.cpp \ bindings/js/JSDOMWindowCustom.cpp \ bindings/js/JSDOMWindowShell.cpp \ |