OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorhjk <qtc-committer@nokia.com>
Wed, 21 Jan 2009 10:57:42 +0000 (11:57 +0100)
committerhjk <qtc-committer@nokia.com>
Wed, 21 Jan 2009 10:57:42 +0000 (11:57 +0100)
commitdf92275f4622de20a680cb4b8a53c2cae7cb7e13
tree440e720b1f18b333cd80c92cfa318a3a15b91861
parentf93bd26a3a3f782231f94b74a7d09df49e38459f
parent8a322699c2a9b9c6a6862c61b59548236294af28
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline