summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-20 18:18:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-20 18:18:33 (GMT)
commitdb87996d4ca90f8fffb5a8e012fa7f2336c038b0 (patch)
tree7d0b0793b879873dae8dfebea74e028596a78fba /src/corelib/global
parent1108a20ee3e4190d58dce1efe0a0bf0b3f88491d (diff)
parent18fa6495b20ad704c77035073b009d58ad0c52e5 (diff)
downloadQt-db87996d4ca90f8fffb5a8e012fa7f2336c038b0.zip
Qt-db87996d4ca90f8fffb5a8e012fa7f2336c038b0.tar.gz
Qt-db87996d4ca90f8fffb5a8e012fa7f2336c038b0.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: My 4.6.3 changes. Added my 4.6.3 changes. My 4.6.3 changes.
Diffstat (limited to 'src/corelib/global')
0 files changed, 0 insertions, 0 deletions