Merge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor
authorAndy Nichols <andy.nichols@nokia.com>
Wed, 31 Aug 2011 11:35:03 +0000 (13:35 +0200)
committerAndy Nichols <andy.nichols@nokia.com>
Wed, 31 Aug 2011 11:35:03 +0000 (13:35 +0200)
commit67ced368367681dd51e617b298d2f6643d940b87
treedc91b6a60e61cc26c5d7c0f3d8ebf45759d31aa3
parentb0f568f83ccf02e9d46b0df7aa3035d64698fbe5
parent772573d867280747b724b4f2e57023d3febe5d87
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor