Merge branch 'haptics2' of gitorious.org:~kimgronholm/webkit/kimgronholms-webkit...
authorSimon Hausmann <simon.hausmann@nokia.com>
Wed, 4 Aug 2010 11:30:50 +0000 (13:30 +0200)
committerSimon Hausmann <simon.hausmann@nokia.com>
Wed, 4 Aug 2010 11:30:50 +0000 (13:30 +0200)
commit0d41f3c265d255484462767f206605c05540f2fa
tree9bd0eafdb5c181067e7f244a24b614b268bf9464
parent20c90a1df97b9ca403a562e19624b2245de4c09e
parent83db6ec952791adfb3eaf2ad0de899f585a758ba
Merge branch 'haptics2' of gitorious.org:~kimgronholm/webkit/kimgronholms-webkit into qtwebkit-2.1
WebCore/page/EventHandler.cpp
WebCore/page/EventHandler.h