Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
authorJan-Arve Saether <jan-arve.saether@nokia.com>
Wed, 7 Sep 2011 06:20:24 +0000 (08:20 +0200)
committerJan-Arve Saether <jan-arve.saether@nokia.com>
Wed, 7 Sep 2011 06:20:24 +0000 (08:20 +0200)
commit9d34e9d705cf2f054a668d9e6aafb2efcd500913
tree68f2b626e84ba9772c0e7c81e48a1e300421f145
parent80f9451b605aa2eb181d76b79bc1869a3cd9e513
parent3927585b3c74c8ccf61b84a525947237f02ea485
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team