History

cleanup bad merge

ZappoMan committed 12 years ago

Commit e35df791 parent fe1a6b82 files · +1 −7Browse files

Showing the changes to libraries/script-engine/src/EventTypes.cpp (1 of 2 files). Show all

Unified · Split

libraries/script-engine/src/EventTypes.cpp+1−2
@@ -347,8 +347,7 @@ TouchEvent::TouchEvent(const QTouchEvent& event) : · 346 unmodified lines
347347 initWithQTouchEvent(event);
348348 }
349349
350−TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other)
351−{
350+TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other) {
352351 initWithQTouchEvent(event);
353352 calculateMetaAttributes(other);
354353 }