Merge remote branch 'origin/cmakeport' into qmlintegration
authorFrederik Gladhorn <gladhorn@kde.org>
Sat, 22 Jan 2011 23:17:58 +0000 (00:17 +0100)
committerFrederik Gladhorn <gladhorn@kde.org>
Sat, 22 Jan 2011 23:17:58 +0000 (00:17 +0100)
commitee18cc1878df25bd309029433068c9f80235bc51
tree25dd2abdf13423591683a9842fe019a94a27626d
parent8d247e2f7e692a1932406be7da9b93fb236ad05d
parent458d427b91bf51d7251736a8007db10a99f91626
Merge remote branch 'origin/cmakeport' into qmlintegration