OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Wed, 12 Jan 2011 09:20:56 +0000 (10:20 +0100)
committercon <qtc-committer@nokia.com>
Wed, 12 Jan 2011 09:20:56 +0000 (10:20 +0100)
commit113f8c3415501525604872b4140816cc46c918f2
tree556480886de92e6d443771504fd8504aa0d5708d
parentf46a87a6f5e2a5069e4d80abf48cd48dd568a9c3
parentf21b1430f8b2cb62d15d42d127e690362bf49093
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
src/plugins/coreplugin/progressmanager/futureprogress.cpp