OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorhjk <qtc-committer@nokia.com>
Wed, 7 Jan 2009 14:16:31 +0000 (15:16 +0100)
committerhjk <qtc-committer@nokia.com>
Wed, 7 Jan 2009 14:16:31 +0000 (15:16 +0100)
commitde376227485205332cc8de2955192fd7602d86af
tree1e03ab639759522315e577ea901c5957e4cab9cd
parentb4c1552ec2f223d9c2096c6e498d68675d98b7fd
parent7800e33c18a5b1786fadc73060a5fce5c371dfff
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline