Fix failed rebase
authorAlan Alpert <alan.alpert@nokia.com>
Mon, 19 Mar 2012 06:46:49 +0000 (16:46 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 19 Mar 2012 16:07:08 +0000 (17:07 +0100)
commitf3bec84894a3e443fc4513539a99045737be3236
tree440854b7d7b4a336df7325178cb953a3c916b3d1
parent37bd02abf10cdad2c069c08a9fe19913e8447de3
Fix failed rebase

Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
examples/quick/accessibility/content/Checkbox.qml [moved from examples/declarative/accessibility/widgets/Checkbox.qml with 100% similarity]
examples/quick/accessibility/content/Slider.qml [moved from examples/declarative/accessibility/widgets/Slider.qml with 100% similarity]