OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Mon, 18 Apr 2011 11:57:18 +0000 (13:57 +0200)
committercon <qtc-committer@nokia.com>
Mon, 18 Apr 2011 11:57:18 +0000 (13:57 +0200)
commitd1539ebbc42e81a523d07844a480c59b18f03087
treed7dec3876109ae9873cce9ce879203aadaec2be1
parent5b02bf94a84094b684a3b04bc0f9754d1a08bd86
parent141f53cfee8471f926cf7f10e0cce18e34e4b718
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline