Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
authorLars Knoll <lars.knoll@nokia.com>
Wed, 6 Jul 2011 12:08:13 +0000 (14:08 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Wed, 6 Jul 2011 12:08:13 +0000 (14:08 +0200)
commit8d80e7c49bb8debc3a9b8e9d57e76f6ab981f384
treefa865e6e3258e552900c96b16abbad2ed97a5c0e
parentef379f313f65f96a4cd5b422520a7ce0b18d2022
parent379bd6810149066cc8ab4d3b2393178bb59e220c
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor