summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-05-27 13:25:50 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-05-27 13:25:50 (GMT)
commit9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (patch)
tree09a609ee6f560390d7385e524421d16d6d43f083 /doc
parentc09b481edd82942cdc85d138c2160004bd71a54e (diff)
parent271a96f201ebcd346bb532e207c1d0e465f89584 (diff)
downloadQt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.zip
Qt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.tar.gz
Qt-9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc.tar.bz2
Merge branch '4.8' into qt-4.8-from-4.7
Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions