diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:46:12 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:26 +0100 |
| commit | 1ffb211e1b85290ba4deec090093a688b26c6082 (patch) | |
| tree | 3d61cdf16200c21e2f6c3e3025528ee6907a54d6 /Android.mk | |
| parent | 967717af5423377c967781471ee106e2bb4e11c8 (diff) | |
| download | external_webkit-1ffb211e1b85290ba4deec090093a688b26c6082.zip external_webkit-1ffb211e1b85290ba4deec090093a688b26c6082.tar.gz external_webkit-1ffb211e1b85290ba4deec090093a688b26c6082.tar.bz2 | |
Merge WebKit at r63859: Fix conflicts.
html/HTMLCanvasElement.h due to http://trac.webkit.org/changeset/63502
html/HTMLLinkElement.cpp due to http://trac.webkit.org/changeset/63622
Android.mk and WebCore/Android.mk due to http://trac.webkit.org/changeset/63735
WebCore/page/Settings.cpp|h due to http://trac.webkit.org/changeset/63537
WebCore/page/EventHandler.cpp|h due to http://trac.webkit.org/changeset/63807
WebCore/Android.jscbindings.mk due to http://trac.webkit.org/changeset/63193
WebCore/platform/network/ResourceHandle.h due to http://trac.webkit.org/changeset/63332
Change-Id: I03c929b97550014373f044f56c248040b66118f0
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -127,10 +127,7 @@ LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(LOCAL_PATH)/WebCore \ $(LOCAL_PATH)/WebCore/accessibility \ -<<<<<<< HEAD:Android.mk $(LOCAL_PATH)/WebCore/bindings/ \ -======= ->>>>>>> webkit.org at r63859:Android.mk $(LOCAL_PATH)/WebCore/bindings/generic \ $(LOCAL_PATH)/WebCore/css \ $(LOCAL_PATH)/WebCore/dom \ |