Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
authorIain <qt-info@nokia.com>
Wed, 13 Jan 2010 14:29:35 +0000 (14:29 +0000)
committerIain <qt-info@nokia.com>
Wed, 13 Jan 2010 14:29:35 +0000 (14:29 +0000)
commitd7d67cc18a7a51703aa2cd4a8b0c64fa8cadf6a7
treed594db6d7df67f51cd3596ad1e6fcc7b3edfeb85
parentf247315cece2929d471eebfbd7e40bfb4eca831b
parent1cb8e4b9a569023ad44060252df0b891c1a331d1
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
tools/configure/configureapp.cpp