Fix merge
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 12 Mar 2012 02:56:12 +0000 (12:56 +1000)
committerQt by Nokia <qt-info@nokia.com>
Thu, 15 Mar 2012 09:14:37 +0000 (10:14 +0100)
commit1c8e65a0999c81d2252757f8872c663417270d37
tree6e5e0fe3ad9ec83d7d1af74b151b655eaabed3a9
parent67f589209dc856be3ac6261f51023125343812ce
Fix merge

Examples are in quick, not qtquick, since the rename merge.

Change-Id: Ideb677752c3ea320bbddba49204d37e8a34e2609
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
examples/quick/mousearea/mousearea-wheel-example.qml [moved from examples/qtquick/mousearea/mousearea-wheel-example.qml with 100% similarity]