diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:27:20 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:59 +0000 |
| commit | cae449b1dff813bce2972d779eb121f74e5d3014 (patch) | |
| tree | 7a0f81690999d67248904b8e135321685fb80a81 /WebCore/page | |
| parent | 91f28d81678b7c10358c9352239d6fb5cffb9550 (diff) | |
| download | external_webkit-cae449b1dff813bce2972d779eb121f74e5d3014.zip external_webkit-cae449b1dff813bce2972d779eb121f74e5d3014.tar.gz external_webkit-cae449b1dff813bce2972d779eb121f74e5d3014.tar.bz2 | |
Merge webkit.org at r54127 : Resolve conflicts in V8 touch events bindings.
The V8 touch event bindings weren't upstreamed, but this code has now all been deleted in favour of auto-generation.
See http://trac.webkit.org/changeset/52663 for the change that removes the indexed getters used for touch events
Change-Id: Ie59c504d7efcb408c18f76d085db63bc1c4a96c4
Diffstat (limited to 'WebCore/page')
0 files changed, 0 insertions, 0 deletions