Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
authorJan-Arve Sæther <jan-arve.saether@nokia.com>
Fri, 19 Nov 2010 10:21:30 +0000 (11:21 +0100)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>
Fri, 19 Nov 2010 10:21:30 +0000 (11:21 +0100)
commitab13e9c099a505a821caaccc6ae252388e676083
tree503fe8c32d30c0e408defc0d7c54d47eeb2d6cc0
parent4258dd04e25c8831be9e8a7dc45b52d34782cb35
parent72378ce571bcb88d0519a1b02d0e543b5237d613
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7