OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 12:23:25 +0000 (13:23 +0100)
committerhjk <qtc-committer@nokia.com>
Tue, 27 Jan 2009 12:23:25 +0000 (13:23 +0100)
commitac8ed036d5b381369483f71896120266043b4f27
tree97b495b1fb8a259917e9f5602d69e8c94e96b310
parentf449bc6f91a1e44237bc1ea9075b61862ed50405
parent4038641db3eb272e555c5c39b796e28d1a6083f2
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline