OSDN Git Service

resolved conflicts for merge of da53ac10 to master
[android-x86/external-webkit.git] / WebCore / wml / WMLBRElement.cpp
2010-08-05 Brian Carlstromresolved conflicts for merge of da53ac10 to master
2010-07-16 The Android Open... am 02f67ae0: am ae583467: add meta-files about 3rd...
2010-07-15 Joe Onoratoam 72533818: am 4da2dabd: Merge "The ICU data is no...
2010-07-14 Jeff Brownam b47b5d4a: am 652e9a01: Migrate to new keycode consta...
2010-07-09 The Android Open... am b34d9d68: merge from open-source master
2010-07-01 Patrick Scottam 939d1819: am 9d4701f9: Push a local reference frame...
2010-06-21 Patrick ScottMerge "Initial messaging model for project 'smoke'"
2010-05-27 Grace KlobaMerge "Fix popup window default size."
2010-05-27 Steve BlockMerge WebKit at r60074: Initial merge by git
2009-11-15 Jean-Baptiste Querumerge from eclair
2009-11-13 Jean-Baptiste Querueclair snapshot
2009-08-06 Jean-Baptiste Querumerge from open-source master
2009-08-04 Jean-Baptiste Querumerge from open-source master
2009-07-28 Patrick Scottam 173247db: (-s ours) Do not merge.
2009-07-26 Jean-Baptiste Querureconcile korg/master into goog/master
2009-07-22 Cary Clarkam 70522f5f: adjust right edge of copy bounds if edge...
2009-07-15 Jean-Baptiste QueruMerge commit 'goog/readonly-korg-master' into merge_kor...
2009-07-10 Patrick Scottam fbb3cf06: (-s ours) Do not merge.
2009-07-09 Mike LeBeauMerge commit 'c0957e2d' into manualmerge
2009-07-09 Android (Google... am dbdaeb91: (-s ours) Merge change 6642 into donut
2009-07-09 Grace Klobaam cb86952d: Fix #1896846. Move reset the meta data...
2009-07-07 Grace Klobaam b116c1a0: Make deep copy of the String when use...
2009-07-01 Patrick Scottam 7ba1b9e1: (-s ours) Do not merge
2009-07-01 Patrick Scottam 40f0a966: (-s ours) Do not merge
2009-06-30 Grace Klobaresolved conflicts for merge of dac9d5be to master
2009-06-26 Cary Clarkam 14d2a338: Add security fix as seen in trac.webkit...
2009-06-23 Sriram RamanMerge commit 'd768f1ca' into manualmerge
2009-06-19 Feng QianMerge commit 'goog/master-webkit-merge' into webkit...
2009-06-18 Feng QianMerge commit 'goog/master' into webkit_merge
2009-06-17 Feng QianGet WebKit r44544.
2009-03-17 Jean-Baptiste QueruMerge commit 'remotes/korg/cupcake' into merge
2009-03-05 The Android Open... auto import from //depot/cupcake/@136594