OSDN Git Service

Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1
authordt <qtc-committer@nokia.com>
Wed, 8 Apr 2009 09:49:36 +0000 (11:49 +0200)
committerdt <qtc-committer@nokia.com>
Wed, 8 Apr 2009 09:49:36 +0000 (11:49 +0200)
commit8261498c11bb09a3815b3daad784a31ed5414647
treecb2d944fe4d5bc53551e76b79157b39a64a48eac
parent0dc21f42729585ed092178ef766b9236ba3049c2
parentde6a0cfea9e437663f03253dfe4f84991628cf65
Merge branch '1.1' of git@scm.dev.nokia.troll.no:creator/mainline into 1.1