summaryrefslogtreecommitdiffstats
path: root/dist/changes-2.2.0
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-02-21 16:39:56 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-02-21 16:39:56 (GMT)
commit1d054b71a4a97d197f345e100e1dc9ed8712199a (patch)
treeb2385d4b056b4bea002965319d1eda8d9b7a9589 /dist/changes-2.2.0
parent8cc0e2327eaffb14c135f229d49386f61f1e1cae (diff)
parentd8b3a29279ff71a6415074872ec97dad6622c03d (diff)
downloadQt-1d054b71a4a97d197f345e100e1dc9ed8712199a.zip
Qt-1d054b71a4a97d197f345e100e1dc9ed8712199a.tar.gz
Qt-1d054b71a4a97d197f345e100e1dc9ed8712199a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts: doc/src/index.qdoc doc/src/mainpage.qdoc
Diffstat (limited to 'dist/changes-2.2.0')
0 files changed, 0 insertions, 0 deletions