OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Thu, 25 Nov 2010 16:51:10 +0000 (17:51 +0100)
committercon <qtc-committer@nokia.com>
Thu, 25 Nov 2010 16:51:10 +0000 (17:51 +0100)
commit7b7ce043726dd27bfb97884326a01f2632549617
treec0b2218a8701ae2a730080f96524b2408a9f6e42
parent3c69d2ceebf8e7d36e5ab0e6f8ad2461d1d217fc
parenta2362a4bdeb2aa1b30df3127e7d7e4e402e3fadc
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline