/Tests/ExternalProjectUpdate/

ad>
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-02-04 11:28:14 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-02-04 11:28:14 (GMT)
commitce0fc2ebeaf195368c31b143a40850f01ada450a (patch)
tree3c46a405766b4ec5a5676fca15df5d4e13ca2342
parent39e7c4de155a150a0e7da6e40f59aadecaea0a8a (diff)
parent74ad5ce57adedc91717ffd67e3e65b8f76d12052 (diff)
downloadQt-ce0fc2ebeaf195368c31b143a40850f01ada450a.zip
Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.gz
Qt-ce0fc2ebeaf195368c31b143a40850f01ada450a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
Diffstat