OSDN Git Service

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
authorcon <qtc-committer@nokia.com>
Thu, 1 Jul 2010 10:45:25 +0000 (12:45 +0200)
committercon <qtc-committer@nokia.com>
Thu, 1 Jul 2010 10:45:25 +0000 (12:45 +0200)
commit8f883cad8268c816ef8684281f54249bcd4429ce
treef588075388bb24167cebd4f4fd3176c6110ab6d2
parentf29edad5602517dc35cf5a4fe79f068792232555
parent2dfa9772f68d11ce9a9e5c1b172a299dc73b00fc
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline