Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge Webkit at r58956: Initial merge by Git. | Ben Murdoch | 2010-05-14 | 1 | -0/+6 |
| | | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 | ||||
* | Merge webkit.org at r54127 : Fix conflicts due to use of OS_ANDROID | Steve Block | 2010-02-04 | 1 | -5/+1 |
| | | | | | | See http://trac.webkit.org/changeset/52791 Change-Id: I0e1a6ae16f93cdbb12ae5770607a220079451cb8 | ||||
* | Merge webkit.org at r54127 : Initial merge by git | Steve Block | 2010-02-04 | 1 | -1/+5 |
| | | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82 | ||||
* | Merge webkit.org at r51976 : Fix general conflicts. | Steve Block | 2009-12-17 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7 | ||||
* | Merge webkit.org at r51976 : Initial merge by git. | Steve Block | 2009-12-17 | 1 | -1/+5 |
| | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43 | ||||
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 1 | -25/+81 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+121 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -121/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -30/+58 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 1 | -0/+93 |