summaryrefslogtreecommitdiffstats
path: root/dist/changes-4.1.1
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2011-03-11 14:04:57 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2011-03-11 14:04:57 (GMT)
commit2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398 (patch)
tree3833140ddaca4723f452ffa6de973784380d91b2 /dist/changes-4.1.1
parent649e65519bef38948a818f282e3022d034dc80a5 (diff)
parent4f3587e749a8503f6207174705ed5db74affb3a5 (diff)
downloadQt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.zip
Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.gz
Qt-2ec2dc55ddf424f5a7acd0a4729ddd9af2d7c398.tar.bz2
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Conflicts: src/s60installs/eabi/QtOpenVGu.def
Diffstat (limited to 'dist/changes-4.1.1')
0 files changed, 0 insertions, 0 deletions