Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
authorWarwick Allison <warwick.allison@nokia.com>
Wed, 4 Nov 2009 03:58:28 +0000 (13:58 +1000)
committerWarwick Allison <warwick.allison@nokia.com>
Wed, 4 Nov 2009 03:58:28 +0000 (13:58 +1000)
commitbe71186962db5974113e89b0e7c7aa1ab3987379
tree4ea4ed9124585c9521b395082359df6113e5541e
parent714f255d1da79c8824531fdea580d2ad7364e00b
parente2ecd43f569f172909fdd3e02fe3c1b70b02fc9e
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6