Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
authorJanne Anttila <janne.anttila@digia.com>
Tue, 2 Jun 2009 10:31:58 +0000 (13:31 +0300)
committerJanne Anttila <janne.anttila@digia.com>
Tue, 2 Jun 2009 10:31:58 +0000 (13:31 +0300)
commit9f021d7c3130a93e2b0546136b873118f48772cf
treeed1910760e2773b5026021c64b72bd2632663a6c
parentf352f8e1bb1c34da9447f645eb923e322407d973
parent17a4589e4d8e5dede5dc786a284115cb822872e0
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

Conflicts:
configure.exe
configure.exe
tools/configure/configureapp.cpp