Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
authorLars Knoll <lars.knoll@nokia.com>
Tue, 12 Jul 2011 14:11:03 +0000 (16:11 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 12 Jul 2011 14:11:03 +0000 (16:11 +0200)
commit2770415f921d494e30e9a770c40b538d223351d6
tree929f375ef83033efd5c463d181494b3ca37bfa3f
parent992ef929dff21e079f7d8a207c07dbfd0c3c8f78
parent2371147354d4436bb54c588662ac315dd4c2f940
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor