OSDN Git Service

Merge WebKit at r71558: Initial merge by git.
[android-x86/external-webkit.git] / WebCore / rendering / RenderLineBoxList.h
2010-11-17 Teng-Hui ZhuMerge WebKit at r71558: Initial merge by git.
2010-11-11 Derek SollenbergerMerge "Use a fixed number of BaseTiles per TiledPage."
2010-11-09 John ReckMerge Webkit at r70949: Initial merge by git.
2010-10-21 Ben Murdocham d844e1f0: (-s ours) am 2da7ed0b: Cherry-pick WebKit...
2010-10-21 Ben Murdocham c194fa2c: (-s ours) am ee4c9585: Cherry-pick WebKit...
2010-10-21 Ben Murdocham 219c89f0: (-s ours) am 3017f37b: Cherry-pick WebKit...
2010-10-21 Ben Murdocham 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit...
2010-10-21 Ben Murdocham d377cc76: (-s ours) am 80a0e2c2: Cherry-pick WebKit...
2010-10-21 Ben Murdocham 741c2272: (-s ours) am d3bed0e7: Cherry-pick WebKit...
2010-10-21 Ben Murdocham 7616c8cd: (-s ours) am 8da84207: Cherry-pick WebKit...
2010-10-21 Ben Murdocham ec63c9f9: (-s ours) am a7b8ec70: Cherry-pick WebKit...
2010-10-19 Ben Murdocham 2346109e: (-s ours) am 93bec1ec: DO NOT MERGE :...
2010-10-19 Shimeng (Simon)... am 15643db2: am 77ab6dc8: Don\'t force video end event...
2010-10-19 Leon Clarkeam 06308c2c: (-s ours) am 156ddd48: Add more padding...
2010-10-19 Nicolas Roardam c79cedac: (-s ours) am 7d095dd5: fix the pause(...
2010-10-19 Nicolas Roardam e4f471f5: (-s ours) am 44b3c7e8: Fix media element...
2010-10-19 Nicolas Roardam 7fc27f09: (-s ours) am 3d57c253: Implement the audio...
2010-10-18 Ben Murdocham fdbac3da: (-s ours) am 5013a3fb: DO NOT MERGE Implem...
2010-10-18 Shimeng (Simon)... am ee47e11a: (-s ours) am f6b396da: DO NOT MERGE
2010-10-15 Kenny Rootresolved conflicts for merge of 1457b739 to master
2010-10-12 Cary Clarkam e0482608: am 5cff132a: change webkit text select...
2010-10-10 Patrick Scottam ffbc540c: (-s ours) am 3f8366e5: Revert to skia...
2010-10-01 Cary Clarkam 8dd042ec: (-s ours) am 8180f816: Do not merge: fix...
2010-09-15 Cary Clarkam 71d8d800: (-s ours) am 1441f89d: Do not merge -...
2010-09-13 Steve Blockam d7ab5cca: (-s ours) am e3a33d1e: Cherry-pick securit...
2010-09-10 Steve Blockam 574b2420: am 946ea101: Cherry-pick security fix...
2010-09-10 Steve Blockam d8a7ee4d: (-s ours) am 93f07dbc: Cherry-pick securit...
2010-09-10 Steve Blockam e21fd1b6: am badca5a6: Cherry-pick security fix...
2010-09-10 Steve Blockam 4b59a578: am 0a05678e: Cherry-pick security fix...
2010-09-10 Steve Blockam 7777773e: (-s ours) am 6dba6e09: Cherry-pick securit...
2010-09-10 Steve Blockam 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick securit...
2010-09-10 Steve Blockam 4c6e224c: am e1d3e323: Cherry-pick security fix...
2010-09-10 Steve Blockam a9b9e574: am da4ffba3: Cherry-pick security fix...
2010-09-10 Steve Blockam 359de72a: am 237faca5: Cherry-pick security fix...
2010-09-10 Steve Blockam e772cff7: (-s ours) am 440c0366: Cherry-pick securit...
2010-09-10 Steve Blockam a8a44d01: am be2b5a3f: Cherry-pick security fix...
2010-09-10 Steve Blockam 866b5c80: (-s ours) am d8dd893d: Cherry-pick securit...
2010-09-10 Steve Blockam 48c3fafe: am eea24577: Cherry-pick security fix...
2010-09-10 Steve Blockam 9836c30e: am a926fcfd: Cherry-pick security fix...
2010-08-31 Melanie Clementsam cd011297: am ff93a851: Bug fix 2337042 <base> URL...
2010-08-27 Cary Clarkam 586c8632: (-s ours) am 90fa57cd: DO NOT MERGE make...
2010-08-24 Cary Clarkam e7a07088: am 21ed5a45: Merge "check for null picture...
2010-08-24 Jean-Baptiste Queruam f3151d7b: am 828ef22d: merge -s ours from froyo...
2010-08-24 Cary Clarkam 0ee15178: (-s ours) am e4be1fd5: DO NOT MERGE Refact...
2010-08-17 Henrik Baardam 3c54ece0: am 5dc34a85: activeDocumentLoader() causes...
2010-08-07 Steve Blockam 7c8c1ab3: am e9ee2d86: am a4279478: Cherry-pick...
2010-08-07 Steve Blockam 373399bd: am 7162fe0e: am 2b6ea029: Cherry-pick...
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 Cary ClarkMerge "handle out of order selections"
2010-07-09 The Android Open... am b34d9d68: merge from open-source master
2010-07-09 Steve BlockMerge WebKit at r62496: 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 Grace Klobaam fa67f45c: Fix WebKit keygen. Has submitted the chang...
2009-06-15 Android (Google... am c55ff27e: (-s ours) Merge change 4191 into donut
2009-06-12 Android (Google... am 40e08ce5: (-s ours) Merge change 3774 into donut
2009-06-11 Cary Clarkam 3a3100a3: (-s ours) add security fix to webkit
2009-06-08 Cary ClarkMerge commit 'ecc88d' into manualmerge
2009-06-04 Patrick Scottresolved conflicts for merge of d88ddb to master
2009-05-12 Guang Zhumerged d15fb80, resolved conflicts
2009-04-30 android-build Shar... am caa8647: Merge change 598 into donut
2009-04-30 Android (Google... am 870c405: Merge change 587 into donut
2009-04-30 android-build Shar... am b23d00d: Respect globalAlpha (fill, stroke, images)
2009-04-23 Jean-Baptiste QueruMerge donut into master
2009-04-23 Jean-Baptiste QueruMerge donut into master
2009-04-11 Feng QianMerge branch 'readonly-p4-master'
2009-04-11 Feng QianAI 145796: Land the WebKit merge @r42026.