Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
authorJanne Koskinen <janne.p.koskinen@digia.com>
Thu, 4 Nov 2010 13:10:03 +0000 (15:10 +0200)
committerJanne Koskinen <janne.p.koskinen@digia.com>
Thu, 4 Nov 2010 13:10:03 +0000 (15:10 +0200)
commit4e0265de9d1f27d91d844f8742757cec376f6431
tree7f0d6ccdc6cf2f3cbe5be7dc548bd08de9ff8b07
parent5a79d8e83d1f62e365e179b84fa7be1112eb8a52
parent564058a1bbfb1c67bc3d68b7c7a2ebfe83481334
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7