Merge "Merge branch 'buildsystem' (second round)" into refs/staging/master
authorMark Brand <mabrand@mabrand.nl>
Fri, 29 Jun 2012 19:26:11 +0000 (21:26 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 29 Jun 2012 19:26:11 +0000 (21:26 +0200)
commitf4f0c8b99b362822f85dd1859518e89d33e4bd3b
tree1de8f74ce9dc211668b8a10f4f873457fcb74363
parentddf7233125dbf7dfb218fd47f77a94446ce3c027
parent1491065506eb97c9def93b908db1df9fcdf3fff0
Merge "Merge branch 'buildsystem' (second round)" into refs/staging/master