Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
authorJanne Koskinen <janne.p.koskinen@digia.com>
Mon, 25 Jan 2010 06:19:34 +0000 (08:19 +0200)
committerJanne Koskinen <janne.p.koskinen@digia.com>
Mon, 25 Jan 2010 06:19:34 +0000 (08:19 +0200)
commit05c543c75043824e12dac17a55e89bc11e74c7a4
tree4b9b117084b21dc9a8486befefd2f60c138c1ea4
parent7bc18035816a2eac15dfac4d987eb9bf43f90ef6
parent6b79cbf5cadbaebef8be895a47ca314724afb1a1
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
src/corelib/tools/qdatetime.cpp
tests/auto/qdatetime/tst_qdatetime.cpp