Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 14 Apr 2011 12:49:06 +0000 (14:49 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 14 Apr 2011 12:49:06 +0000 (14:49 +0200)
commit3ce3bc1bc650f9495cfd94555342c789171b0f62
tree949a8a2de1ba0964180c2aed7b1843786f8dc5df
parentf148b278715f561830352fc6f013b195ede3bce9
parent49792128efb4ad1348b3be196f7a1b7a9dd3876c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline