diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:27:44 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:59 +0000 |
| commit | 4247478b67d5b291c805d149cd09b6ac249d007d (patch) | |
| tree | 4f3684826531f058ac03e83cc499d8de0826ac23 /WebKitTools | |
| parent | cae449b1dff813bce2972d779eb121f74e5d3014 (diff) | |
| download | external_webkit-4247478b67d5b291c805d149cd09b6ac249d007d.zip external_webkit-4247478b67d5b291c805d149cd09b6ac249d007d.tar.gz external_webkit-4247478b67d5b291c805d149cd09b6ac249d007d.tar.bz2 | |
Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent
On Android, handleTouchEvent returns int, rather than bool.
Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5
Diffstat (limited to 'WebKitTools')
0 files changed, 0 insertions, 0 deletions