summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-15 12:07:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-15 12:07:32 (GMT)
commit35665053a56f7c74e45d65234630a130ba24a27a (patch)
tree1834ae789f99cfc128c766d45818a7e5c0c5c639 /src/imports
parent167daf1d0d3144cacd3ed79a3faa0d7c7f5d7f1f (diff)
parent8d3d3381c127f0f4dd9fc507c3069acddbf40535 (diff)
downloadQt-35665053a56f7c74e45d65234630a130ba24a27a.zip
Qt-35665053a56f7c74e45d65234630a130ba24a27a.tar.gz
Qt-35665053a56f7c74e45d65234630a130ba24a27a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Join user state of removed text blocks
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions