summaryrefslogtreecommitdiffstats
path: root/dist/changes-2.1.1
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-08-16 06:00:17 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-08-16 06:00:17 (GMT)
commit1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1 (patch)
tree65b658582151aa9b47a6b9843463dddd032a8323 /dist/changes-2.1.1
parentab90235dfa1874e5c70875ed9b68817e698a55b3 (diff)
parent35665053a56f7c74e45d65234630a130ba24a27a (diff)
downloadQt-1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1.zip
Qt-1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1.tar.gz
Qt-1c0ed07f8f65a2b8d5a189ac3e438bd798a87ed1.tar.bz2
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts: src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'dist/changes-2.1.1')
0 files changed, 0 insertions, 0 deletions