summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-09-22 00:47:15 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-09-22 00:47:15 (GMT)
commitc4c12f947b0480fd0695e1885ebec9ab496f6bf4 (patch)
tree97c6dbab0e153ea2cb998c72f6e7853da9e3fdff /tools
parentdbd57aaa5fdcae647b9def443631ce39af72401d (diff)
parent0598be4043f0f483f9d32040df57ffede322c038 (diff)
downloadQt-c4c12f947b0480fd0695e1885ebec9ab496f6bf4.zip
Qt-c4c12f947b0480fd0695e1885ebec9ab496f6bf4.tar.gz
Qt-c4c12f947b0480fd0695e1885ebec9ab496f6bf4.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts: doc/src/snippets/declarative/repeater.qml
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions