Merge branch 'master' of scm.dev.nokia.troll.no:qt/qttools-staging
authorEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 12:57:06 +0000 (15:57 +0300)
committerEckhart Koppen <eckhart.koppen@nokia.com>
Fri, 13 May 2011 12:57:06 +0000 (15:57 +0300)
commitb30b8c5481c048477a374a7563a55ceb2c8edc72
tree57e17e13a5c2dd2850cb40ea2fa0bc3233b5ea8c
parent0a6f01cb54bfebcdcf7bf683e17536a1a9933098
parented81ec87cd8c1f5d3c61ecdbed12211a7d754082
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qttools-staging