summaryrefslogtreecommitdiffstats
path: root/tools/qml/main.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-19 14:43:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-19 14:43:12 (GMT)
commitaa9211937ff38c0fffa55bc879130b33f03865ff (patch)
tree0d4dee5598a9eddcfd59689eef6879695ff15317 /tools/qml/main.cpp
parentd9e6c98c5cb39c7f6397a8015e1395e040135949 (diff)
parentf274db8040546e54b1ef0e674d9733714c68d4d5 (diff)
downloadQt-aa9211937ff38c0fffa55bc879130b33f03865ff.zip
Qt-aa9211937ff38c0fffa55bc879130b33f03865ff.tar.gz
Qt-aa9211937ff38c0fffa55bc879130b33f03865ff.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add Qt5 comment
Diffstat (limited to 'tools/qml/main.cpp')
0 files changed, 0 insertions, 0 deletions