OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authordt <qtc-committer@nokia.com>
Mon, 4 May 2009 16:23:49 +0000 (18:23 +0200)
committerdt <qtc-committer@nokia.com>
Mon, 4 May 2009 16:23:49 +0000 (18:23 +0200)
commit87a253b38b484c881d4bbc600e6a0c9c14a002d0
tree742cf95d94cc7a7345662a4e4d391bab60238280
parent4e0c418fa647164142cbe90b700aa5b5ea2ea0a0
parent9ba5a81e9b2e3f68efdd460c2b426677ae39a0fc
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline