OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Fix for FBO offset when drawing with alpha
[android-x86/external-webkit.git]
/
WebCore
/
WebCore.qrc
2011-01-29
John Reck
am 591ab58d: (-s ours) DO NOT MERGE - Move localstorage...
blob
|
commitdiff
2011-01-27
Steve Block
am ffbb7741: (-s ours) DO NOT MERGE - Set 660 permissio...
blob
|
commitdiff
2011-01-27
John Reck
am 200de028: (-s ours) DO NOT MERGE - Fixes webicon...
blob
|
commitdiff
2011-01-27
John Reck
am 05072627: (-s ours) DO NOT MERGE - Set 660 permissio...
blob
|
commitdiff
2011-01-27
John Reck
am a9186f56: (-s ours) DO NOT MERGE - Set 660 permissio...
blob
|
commitdiff
2011-01-25
John Reck
am 4c418d61: (-s ours) am 591ab58d: DO NOT MERGE -...
blob
|
commitdiff
2011-01-13
Steve Block
am 32b1eebc: (-s ours) am ffbb7741: DO NOT MERGE -...
blob
|
commitdiff
2011-01-13
John Reck
am 0b77bcc1: (-s ours) am 200de028: DO NOT MERGE -...
blob
|
commitdiff
2011-01-13
John Reck
am 9d46b47d: (-s ours) am 05072627: DO NOT MERGE -...
blob
|
commitdiff
2011-01-13
John Reck
am 35676c5b: (-s ours) am a9186f56: DO NOT MERGE -...
blob
|
commitdiff
2011-01-05
Steve Block
am c9f38c56: (-s ours) am 08fcb454: Cherry-pick WebKit...
blob
|
commitdiff
2010-12-22
Ben Murdoch
am 1e5798a4: am d436a8e4: Allow HTML5 video to seek.
blob
|
commitdiff
2010-12-02
Jean-Baptiste Queru
am 6a2e8695: am 5d1bf1f6: Merge from open-source master
blob
|
commitdiff
2010-12-01
Rob Tsuk
am 1fc015f0: (-s ours) am 4741f411: Do not merge.
blob
|
commitdiff
2010-12-01
Cary Clark
am e5097951: (-s ours) am 5793dcc1: Merge "Do not merge...
blob
|
commitdiff
2010-11-30
Bart Sears
am a5b8875c: (-s ours) am 1baa4609: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am d844e1f0: (-s ours) am 2da7ed0b: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am c194fa2c: (-s ours) am ee4c9585: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am 219c89f0: (-s ours) am 3017f37b: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am 122a6b03: (-s ours) am 910dc2ab: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am d377cc76: (-s ours) am 80a0e2c2: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am 741c2272: (-s ours) am d3bed0e7: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am 7616c8cd: (-s ours) am 8da84207: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-21
Ben Murdoch
am ec63c9f9: (-s ours) am a7b8ec70: Cherry-pick WebKit...
blob
|
commitdiff
2010-10-19
Ben Murdoch
am 2346109e: (-s ours) am 93bec1ec: DO NOT MERGE :...
blob
|
commitdiff
2010-10-19
Shimeng (Simon)...
am 15643db2: am 77ab6dc8: Don\'t force video end event...
blob
|
commitdiff
2010-10-19
Leon Clarke
am 06308c2c: (-s ours) am 156ddd48: Add more padding...
blob
|
commitdiff
2010-10-19
Nicolas Roard
am c79cedac: (-s ours) am 7d095dd5: fix the pause(...
blob
|
commitdiff
2010-10-19
Nicolas Roard
am e4f471f5: (-s ours) am 44b3c7e8: Fix media element...
blob
|
commitdiff
2010-10-19
Nicolas Roard
am 7fc27f09: (-s ours) am 3d57c253: Implement the audio...
blob
|
commitdiff
2010-10-18
Ben Murdoch
am fdbac3da: (-s ours) am 5013a3fb: DO NOT MERGE Implem...
blob
|
commitdiff
2010-10-18
Shimeng (Simon)...
am ee47e11a: (-s ours) am f6b396da: DO NOT MERGE
blob
|
commitdiff
2010-10-15
Kenny Root
resolved conflicts for merge of 1457b739 to master
blob
|
commitdiff
2010-10-12
Cary Clark
am e0482608: am 5cff132a: change webkit text select...
blob
|
commitdiff
2010-10-10
Patrick Scott
am ffbc540c: (-s ours) am 3f8366e5: Revert to skia...
blob
|
commitdiff
2010-10-01
Cary Clark
am 8dd042ec: (-s ours) am 8180f816: Do not merge: fix...
blob
|
commitdiff
2010-09-15
Cary Clark
am 71d8d800: (-s ours) am 1441f89d: Do not merge -...
blob
|
commitdiff
2010-09-13
Steve Block
am d7ab5cca: (-s ours) am e3a33d1e: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am 574b2420: am 946ea101: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am d8a7ee4d: (-s ours) am 93f07dbc: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am e21fd1b6: am badca5a6: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am 4b59a578: am 0a05678e: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am 7777773e: (-s ours) am 6dba6e09: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am 4c6e224c: am e1d3e323: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am a9b9e574: am da4ffba3: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am 359de72a: am 237faca5: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am e772cff7: (-s ours) am 440c0366: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am a8a44d01: am be2b5a3f: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am 866b5c80: (-s ours) am d8dd893d: Cherry-pick securit...
blob
|
commitdiff
2010-09-10
Steve Block
am 48c3fafe: am eea24577: Cherry-pick security fix...
blob
|
commitdiff
2010-09-10
Steve Block
am 9836c30e: am a926fcfd: Cherry-pick security fix...
blob
|
commitdiff
2010-08-31
Melanie Clements
am cd011297: am ff93a851: Bug fix 2337042 <base> URL...
blob
|
commitdiff
2010-08-27
Cary Clark
am 586c8632: (-s ours) am 90fa57cd: DO NOT MERGE make...
blob
|
commitdiff
2010-08-24
Cary Clark
am e7a07088: am 21ed5a45: Merge "check for null picture...
blob
|
commitdiff
2010-08-24
Jean-Baptiste Queru
am f3151d7b: am 828ef22d: merge -s ours from froyo...
blob
|
commitdiff
2010-08-24
Cary Clark
am 0ee15178: (-s ours) am e4be1fd5: DO NOT MERGE Refact...
blob
|
commitdiff
2010-08-17
Henrik Baard
am 3c54ece0: am 5dc34a85: activeDocumentLoader() causes...
blob
|
commitdiff
2010-08-07
Steve Block
am 7c8c1ab3: am e9ee2d86: am a4279478: Cherry-pick...
blob
|
commitdiff
2010-08-07
Steve Block
am 373399bd: am 7162fe0e: am 2b6ea029: Cherry-pick...
blob
|
commitdiff
2010-08-05
Brian Carlstrom
resolved conflicts for merge of da53ac10 to master
blob
|
commitdiff
2010-07-16
The Android Open...
am 02f67ae0: am ae583467: add meta-files about 3rd...
blob
|
commitdiff
2010-07-15
Joe Onorato
am 72533818: am 4da2dabd: Merge "The ICU data is no...
blob
|
commitdiff
2010-07-14
Jeff Brown
am b47b5d4a: am 652e9a01: Migrate to new keycode consta...
blob
|
commitdiff
2010-07-09
Cary Clark
Merge "handle out of order selections"
blob
|
commitdiff
2010-07-09
The Android Open...
am b34d9d68: merge from open-source master
blob
|
commitdiff
2010-07-09
Steve Block
Merge WebKit at r62496: Initial merge by git
blob
|
commitdiff
2010-05-18
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-05-17
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-04-02
The Android Open...
merge from open-source master
blob
|
commitdiff
|
diff to current
2010-02-05
The Android Open...
am 8e03c5a1: am c3e14116: reconcile main tree with...
blob
|
commitdiff
|
diff to current
2010-01-22
Grace Kloba
am 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
Merge commit 'db0b7b50' into merge
blob
|
commitdiff
|
diff to current
2010-01-21
Grace Kloba
Merge commit '91d051d3' into tmp
blob
|
commitdiff
|
diff to current
2010-01-19
Grace Kloba
am 4b178ce7: (-s ours) am f48712a0: DO NOT MERGE.
blob
|
commitdiff
|
diff to current
2010-01-13
Grace Kloba
am 625ef54c: (-s ours) am dbb30613: DO NOT MERGE.
blob
|
commitdiff
|
diff to current
2010-01-12
Steve Block
resolved conflicts for merge of e0286f66 to master
blob
|
commitdiff
|
diff to current
2010-01-11
Grace Kloba
am 4ad9c9b7: (-s ours) am 237bd75b: First draft of...
blob
|
commitdiff
|
diff to current
2009-12-17
Steve Block
am b880d713: am 643ca787: Merge webkit.org at r51976...
blob
|
commitdiff
|
diff to current
2009-12-17
Steve Block
am 643ca787: Merge webkit.org at r51976 : Initial merge...
blob
|
commitdiff
|
diff to current
2009-12-17
Steve Block
Merge webkit.org at r51976 : Initial merge by git.
blob
|
commitdiff
|
diff to current
2009-12-15
Android Git Automerger
Merge commit 'goog/eclair-plus-aosp'
blob
|
commitdiff
|
diff to current
2009-12-05
Grace Kloba
am daa8318d: (-s ours) DO NOT MERGE. This is cherry...
blob
|
commitdiff
|
diff to current
2009-11-18
Grace Kloba
am ffe27b58: Integrate WebKit security fix trac.webkit...
blob
|
commitdiff
|
diff to current
2009-11-15
Jean-Baptiste Queru
merge from open-source master
blob
|
commitdiff
|
diff to current
2009-11-12
Grace Kloba
am a5605499: Changing fit column to screen to exclude...
blob
|
commitdiff
|
diff to current
2009-11-10
Steve Block
am f3df4438: (-s ours) Merge change I43c19e84 into...
blob
|
commitdiff
|
diff to current
2009-11-10
Leon Scroggins
am 6f9b8a17: (-s ours) do not merge -- Fix a clicking...
blob
|
commitdiff
|
diff to current
2009-10-30
Steve Block
am b9fca1a7: (-s ours) Fix Geolocation service to use...
blob
|
commitdiff
|
diff to current
2009-10-30
Grace Kloba
am 5469794f: Avoid constructing the MutexLocker class...
blob
|
commitdiff
|
diff to current
2009-10-22
Grace Kloba
am 228543b5: Apparently we can\'t use atomic_inc/dec...
blob
|
commitdiff
|
diff to current
2009-10-22
Grace Kloba
am 87689f70: Back in 02/08 when we added android_atomic...
blob
|
commitdiff
|
diff to current
2009-10-22
Cary Clark
am e9901563: (-s ours) do not merge: fix copy/paste...
blob
|
commitdiff
|
diff to current
2009-10-20
Steve Block
am 231d4e31: Merge webkit.org at R49305 : Automatic...
blob
|
commitdiff
|
diff to current
2009-10-19
Steve Block
Merge webkit.org at R49305 : Automatic merge by git.
blob
|
commitdiff
|
diff to current
2009-03-17
Jean-Baptiste Queru
Merge commit 'remotes/korg/cupcake' into merge
blob
|
commitdiff
|
diff to current
2009-03-05
The Android Open...
auto import from //depot/cupcake/@136594
blob
|
commitdiff
|
diff to current