diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-04-30 00:18:49 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-04-30 00:18:49 (GMT) |
| commit | 54839beaabb62da8ca238b64683b56e66e1ff10b (patch) | |
| tree | 184394839eaf3769c37d4f38fea603f93d915ea8 /demos/declarative/phonebrowser/content/LikeOMeter.qml | |
| parent | 7a60538c0c12245e8b542a477bcaabac0b9de345 (diff) | |
| parent | 4f98e50ef93f213cc47e5f49cd844b27b8115f99 (diff) | |
| download | Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.zip Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.tar.gz Qt-54839beaabb62da8ca238b64683b56e66e1ff10b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml
examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml
examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml
examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml
examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml
examples/declarative/tutorials/contacts/3_Collections/Button.qml
examples/declarative/tutorials/contacts/3_Collections/ContactField.qml
examples/declarative/tutorials/contacts/3_Collections/FieldText.qml
examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml
Diffstat (limited to 'demos/declarative/phonebrowser/content/LikeOMeter.qml')
0 files changed, 0 insertions, 0 deletions