Merge "Merge branch 'buildsystem'" into refs/staging/master
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 27 Jun 2012 06:26:26 +0000 (08:26 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 27 Jun 2012 06:49:46 +0000 (08:49 +0200)
commit630a481854f9dae38b48e1e5e83435746f38c5ae
tree9eda22de10d09391d1e1ff5cf587526596d1b678
parent7722786a1305d9fdd4e0e8856322352c806de25c
parent4189a0d294999246f5a9680d348a1d160d4f591c
Merge "Merge branch 'buildsystem'" into refs/staging/master