diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-16 15:19:42 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 15:44:28 +0100 |
| commit | e7913fbdd6f145fe1644c90c22aa73cb733c9e17 (patch) | |
| tree | b869ea3532c4ed4e54ae071bf22f3ff71048b6e8 /Source/WebCore/platform/DragData.h | |
| parent | 4aac085d417cce1ecefcf0553724beede7a9670b (diff) | |
| download | external_webkit-e7913fbdd6f145fe1644c90c22aa73cb733c9e17.zip external_webkit-e7913fbdd6f145fe1644c90c22aa73cb733c9e17.tar.gz external_webkit-e7913fbdd6f145fe1644c90c22aa73cb733c9e17.tar.bz2 | |
Merge WebKit at r75993: Fix conflicts.
StyleElement.cpp
Do not undo cherry pick of http://trac.webkit.org/changeset/80787
Conflict due to intermediate change
http://trac.webkit.org/changeset/75338
SliderThumbElement.cpp
Conflict due to Android TOUCH_EVENTS addition and
http://trac.webkit.org/changeset/75749
DOMWindow.cpp
Conflict due to clearDomStorage and
http://trac.webkit.org/changeset/75739
Page.cpp
Conflict due to Android APPLICATION_INSTALLED addition and
http://trac.webkit.org/changeset/75604
DragData.h
See http://trac.webkit.org/changeset/75523
RenderBox.cpp
Conflict due to PLATFORM_ANDROID addition and
http://trac.webkit.org/changeset/75837
.gitignore - keep ours
RenderSVGSolidColor.cpp
This file moved, so copy over our edits.
Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
Diffstat (limited to 'Source/WebCore/platform/DragData.h')
| -rw-r--r-- | Source/WebCore/platform/DragData.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/WebCore/platform/DragData.h b/Source/WebCore/platform/DragData.h index 3bd27fc..42d0d3a 100644 --- a/Source/WebCore/platform/DragData.h +++ b/Source/WebCore/platform/DragData.h @@ -123,9 +123,5 @@ private: } -<<<<<<< HEAD -#endif //!DragData_h -======= #endif // !DragData_h ->>>>>>> WebKit.org @ r75993 |