summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 04:49:40 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-13 04:49:40 (GMT)
commit14821863b830b85ccb29df217a52f1ca52c9c421 (patch)
tree472e41f9c7e54cc6c9ea1fe1d63218d2960876ea /src/activeqt
parentf2d9bdb36061b4b419e777075027f609bf9890b2 (diff)
parentf7b6358f0d8ff9cad1fd1fcb9622fad40cb0f0b0 (diff)
downloadQt-14821863b830b85ccb29df217a52f1ca52c9c421.zip
Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.gz
Qt-14821863b830b85ccb29df217a52f1ca52c9c421.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts: doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'src/activeqt')
0 files changed, 0 insertions, 0 deletions