diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:38:24 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:52:59 +0000 |
| commit | 1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8 (patch) | |
| tree | ced32617716bb0781d7d37837cf3e8d5fd5480ad /WebCore/ChangeLog | |
| parent | 5e2bc6953fe6923165b8a5d7679939693a1d58d6 (diff) | |
| download | external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.zip external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.tar.gz external_webkit-1eef9cbdc7e99b57fa05bfd7e4baefc4a452fbe8.tar.bz2 | |
Merge webkit.org at r54340 : Fix merge conflicts
- Take both for Android makefiles, other than typo for JavaNPObjectV8 upstream
- Take theirs for XCode project file and ChangeLog
- Fix trivial header conflict in V8DocumentCustom
- Keep ours for fix in JNIUtilityPrivate.cpp
- Take theirs for V8DOMWrapper.cpp. Conflict is due to Android addition of TouchEvents, which conflicts with http://trac.webkit.org/changeset/54259
- Take both for Android addition of applicationInstalledCallback
- Take both for Android JSC JIT changes in Platform.h
Change-Id: Ib1a748f204a07a7e736feeee6a0f30f7453754a7
Diffstat (limited to 'WebCore/ChangeLog')
| -rw-r--r-- | WebCore/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index c738ee0..db4c515 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2010-02-04 Holger Hans Peter Freyther <zecke@selfish.org> Reviewed by Xan Lopez. @@ -1309,7 +1307,6 @@ (WebCore::IntPoint::IntPoint): (WebCore::IntPoint::operator AEEPoint): ->>>>>>> webkit.org at r54340 2010-02-02 Steve Block <steveblock@google.com> Reviewed by Adam Barth. @@ -1323,8 +1320,6 @@ (WebCore::AbstractWeakReferenceMap::~AbstractWeakReferenceMap): Added. (WebCore::AbstractWeakReferenceMap::Visitor::~Visitor): Added. -<<<<<<< HEAD -======= 2010-02-02 Avi Drissman <avi@chromium.org> Reviewed by Eric Seidel. @@ -2277,7 +2272,6 @@ (WebCore::RenderMathMLBlock::paint): * mathml/RenderMathMLBlock.h: ->>>>>>> webkit.org at r54340 2010-02-01 Philippe Normand <pnormand@igalia.com> Rubber stamped by Xan Lopez. |