OSDN Git Service

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Mon, 9 Nov 2009 10:36:12 +0000 (11:36 +0100)
committercon <qtc-committer@nokia.com>
Mon, 9 Nov 2009 10:36:12 +0000 (11:36 +0100)
commit040ab7a93fbff6d387e895304f8c5aaa3d6e22f0
treeae5f0645e41ae0dc2ca42c5115fe6691ed5ff844
parent468b76fff20aba095eb0d5c7c46910d8549da58a
parentb0e1fdbfc45967c3371b1771a08ac9a25f9f4a1b
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline