OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorKai Koehne <kai.koehne@nokia.com>
Mon, 23 Aug 2010 14:31:43 +0000 (16:31 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Mon, 23 Aug 2010 14:31:43 +0000 (16:31 +0200)
Merge latest changes of master into merge :)

Conflicts:
doc/qtcreator.qdoc

1  2 
doc/qtcreator.qdoc

Simple merge