diff options
| author | Steve Block <steveblock@google.com> | 2010-08-04 18:16:18 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-08-09 13:25:51 +0100 |
| commit | 27a37fb693b8b9f744cfc3da9eb5a933e922323e (patch) | |
| tree | a483456777caa6daeee6917d88a1fb1853ce26cb /WebCore/Android.mk | |
| parent | ad3386af2204fbbc9033a6dcced2f9b0adcd6f10 (diff) | |
| download | external_webkit-27a37fb693b8b9f744cfc3da9eb5a933e922323e.zip external_webkit-27a37fb693b8b9f744cfc3da9eb5a933e922323e.tar.gz external_webkit-27a37fb693b8b9f744cfc3da9eb5a933e922323e.tar.bz2 | |
Merge WebKit at r64523 : Fix other conflicts
- WebCore/Android.mk
Conflict due to error introduced upstream.
See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk
and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk
- WebCore/html/HTMLFrameSetElement.cpp
Conflict due to ANDROID_FLATTEN_FRAMESET
See http://trac.webkit.org/changeset/64383
- WebCore/page/Navigator.h
Conflict due to APPLICATION_INSTALLED
See http://trac.webkit.org/changeset/64371
- WebCore/rendering/SVGResourcesCycleSolver.cpp
Conflict due to local ENABLE(FILTERS) guard
See http://trac.webkit.org/changeset/64440
Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
Diffstat (limited to 'WebCore/Android.mk')
| -rw-r--r-- | WebCore/Android.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/Android.mk b/WebCore/Android.mk index bc7cc1e..deff632 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -823,15 +823,9 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ storage/IDBObjectStoreRequest.cpp \ storage/IDBRequest.cpp \ storage/IDBSuccessEvent.cpp \ -<<<<<<< HEAD - storage/IndexedDatabase.cpp \ - storage/IndexedDatabaseImpl.cpp \ - storage/IndexedDatabaseRequest.cpp \ -======= storage/IDBFactory.cpp \ storage/IDBFactoryBackendInterface.cpp \ storage/IDBFactoryBackendImpl.cpp \ ->>>>>>> webkit.org at r64523 storage/LocalStorageTask.cpp \ storage/LocalStorageThread.cpp \ storage/OriginQuotaManager.cpp \ |