OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authordt <qtc-committer@nokia.com>
Wed, 28 Jan 2009 12:00:43 +0000 (13:00 +0100)
committerdt <qtc-committer@nokia.com>
Wed, 28 Jan 2009 12:00:43 +0000 (13:00 +0100)
commitb43094f8c7afc20c802a2c38e4d9be5ab668f0ae
treeba548f9abd6e4fc138bb47bacfe1b75d7e7d913b
parentdaea8e66bf1ec3984d38be4f1321783375b8993e
parent3e6cf4e96c74c892d919edf1b97a64c699a704d0
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline