Merge "Merge branch 'buildsystem'" into refs/staging/master
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 20 Jun 2012 08:34:13 +0000 (10:34 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 20 Jun 2012 10:38:32 +0000 (12:38 +0200)
commit6d9c545d2b83305c3c30a0e917e6c3a474dfe66a
tree54a003c6db32c85f80c5fbb46dbf9322855966e6
parent86f953a6d40666a3355e76b3ab2c8a2cf5452ec6
parentb652bffea7a0a1bf209c21d9b73f509226f031bd
Merge "Merge branch 'buildsystem'" into refs/staging/master