OSDN Git Service

Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0
authorhjk <qtc-committer@nokia.com>
Mon, 23 Feb 2009 15:07:02 +0000 (16:07 +0100)
committerhjk <qtc-committer@nokia.com>
Mon, 23 Feb 2009 15:07:02 +0000 (16:07 +0100)
commitdda97a531c3ab53cdd44438e8014e682a4c86236
tree289b3fd8ae8d428921b9ad0d56f5e9fb1fa73571
parent5fbd588a985a9a923d92ab85d092ac943b0d2dde
parent4dfd5ac371612ec9bf2c1ecc8bd117f794fc8b90
Merge branch '1.0.0' of git@scm.dev.nokia.troll.no:creator/mainline into 1.0.0