summaryrefslogtreecommitdiffstats
path: root/dist/changes-4.2CEping
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-04-23 13:47:30 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-04-23 13:47:30 (GMT)
commitff4864e079accef109a8a45e9754f7ac34718ec5 (patch)
tree004c0e6dc99187fa6e2dd35b898c4b41ce30d06e /dist/changes-4.2CEping
parent63414acd04910b6b016786f1c340440562eebca1 (diff)
parent2e8ece735d6a31f4657192e77b9dc53fb2a03e9c (diff)
downloadQt-ff4864e079accef109a8a45e9754f7ac34718ec5.zip
Qt-ff4864e079accef109a8a45e9754f7ac34718ec5.tar.gz
Qt-ff4864e079accef109a8a45e9754f7ac34718ec5.tar.bz2
Merge branch '4.5'
Conflicts: tests/auto/qaction/tst_qaction.cpp
Diffstat (limited to 'dist/changes-4.2CEping')
0 files changed, 0 insertions, 0 deletions