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)
commitbb34372ad53e6bce00220814ef3586ba51eacc06
tree6021c4fb02461afe80a705c2bafaab05732e4f77
parent314fdbce8ce473eb3610be3658c61fab2fac0efb
parent1b95298d9d5d7f39e28c1bdb14afbf24ee8a64f8
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor