Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit at r75315: Initial merge by git. | Steve Block | 2011-05-12 | 1 | -647/+0 |
| | | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 | ||||
* | Merge WebKit at r74534: Initial merge by git. | Ben Murdoch | 2011-05-10 | 1 | -0/+15 |
| | | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb | ||||
* | Merge WebKit at r71558: Initial merge by git. | Teng-Hui Zhu | 2010-11-17 | 1 | -1/+1 |
| | | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c | ||||
* | Merge Webkit at r70949: Initial merge by git. | John Reck | 2010-11-09 | 1 | -5/+5 |
| | | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e | ||||
* | Merge WebKit at r65615 : Initial merge by git. | Iain Merrick | 2010-08-23 | 1 | -34/+34 |
| | | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79 | ||||
* | Merge WebKit at r62496: Initial merge by git | Steve Block | 2010-07-09 | 1 | -1/+1 |
| | | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2 | ||||
* | Merge webkit.org at r60469 : Initial merge by git. | Leon Clarke | 2010-06-08 | 1 | -1/+1 |
| | | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234 | ||||
* | Merge WebKit at r60074: Initial merge by git | Steve Block | 2010-05-27 | 1 | -5/+4 |
| | | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7 | ||||
* | Merge WebKit at r59636: Initial merge by git | Kristian Monsen | 2010-05-25 | 1 | -5/+105 |
| | | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 | ||||
* | Merge Webkit at r58956: Initial merge by Git. | Ben Murdoch | 2010-05-14 | 1 | -0/+2 |
| | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 | ||||
* | Merge webkit.org at r58033 : Initial merge by git | Steve Block | 2010-05-11 | 1 | -24/+23 |
| | | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 | ||||
* | Merge webkit.org at r55033 : Initial merge by git | Steve Block | 2010-04-27 | 1 | -140/+101 |
| | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5 | ||||
* | Merge webkit.org at r54731 : Initial merge by git | Steve Block | 2010-02-16 | 1 | -2/+3 |
| | | | | Change-Id: Ia79977b6cf3b0b00c06ef39419989b28e57e4f4a | ||||
* | Merge webkit.org at r54127 : Take theirs for changes to JavaScript string ↵ | Steve Block | 2010-02-04 | 1 | -1/+34 |
| | | | | | | | | | | | addition. The conflict is due to the fact that we cherry-picked a WebKit change http://trac.webkit.org/changeset/51978 to fix a bug. This change updates all files touched by this change to match webkit.org. See https://android-git.corp.google.com/g/#change,36411 Change-Id: Ie17c59467b74f3bf3be1149bebe086b92b30afc4 | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 1 | -14/+77 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | Cherry-picks a WebKit change to revert recent changes to String addition for ↵ | Steve Block | 2010-01-04 | 1 | -34/+1 |
| | | | | | | | | | | | | | | | | | JSC. WebKit change http://trac.webkit.org/changeset/51975 modified String addition in JSC to use ropes. However, the change was incorrect, so was rolled back in http://trac.webkit.org/changeset/51978. The last WebKit merge was to revision r51976, so picked up the initial, broken change only. This change cherry-picks http://trac.webkit.org/changeset/51978 to revert the original change. Bug: 2336856 Change-Id: I7f48bce6a7f605779424ba0a7601524ab3a71990 | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 1 | -17/+244 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge webkit.org at r50258 : Initial merge by git. | Steve Block | 2009-11-10 | 1 | -1/+42 |
| | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0 | ||||
* | Merge webkit.org at R49305 : Automatic merge by git. | Steve Block | 2009-10-20 | 1 | -1/+24 |
| | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7 | ||||
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 1 | -1/+1 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 1 | -1/+1 |
| | |||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 1 | -3/+3 |
| | |||||
* | Get WebKit r44544. | Feng Qian | 2009-06-17 | 1 | -7/+7 |
| | |||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 1 | -1/+3 |
| | | | | Automated import of CL 145796 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 1 | -13/+13 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+214 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -214/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -0/+214 |