summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdatetimeedit
diff options
context:
space:
mode:
authorAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-09-22 08:53:39 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2009-09-22 08:53:39 (GMT)
commitdef49cd0e2d256ff3c31aa80343ce52f4fd6e2e7 (patch)
tree09e3aa8d6e3f72f815b1beaf6d59261b5f45acdd /tests/auto/qdatetimeedit
parente689e41ad1baad65d90866eefe88a96f5e16fa04 (diff)
parentd14fd301314bcceaf2594a5a18f6d20894c1d353 (diff)
downloadQt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.zip
Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.gz
Qt-def49cd0e2d256ff3c31aa80343ce52f4fd6e2e7.tar.bz2
Merge commit 'origin/4.5' into 4.6
Conflicts: src/corelib/kernel/qcoreapplication.cpp tests/auto/windowsmobile/test/tst_windowsmobile.cpp
Diffstat (limited to 'tests/auto/qdatetimeedit')
0 files changed, 0 insertions, 0 deletions