Merge remote branch 'origin/cmakeport' into qmlintegration
authorFrederik Gladhorn <gladhorn@kde.org>
Sat, 22 Jan 2011 22:58:48 +0000 (23:58 +0100)
committerFrederik Gladhorn <gladhorn@kde.org>
Sat, 22 Jan 2011 22:58:48 +0000 (23:58 +0100)
commitd67a2d6de7e259d9fef8511f236c63ca95175177
treede36e1029dd8978ff9be972cff35321862f7fb24
parent36ffac89e2254cb68fb8d10c085f4840b74e85ef
parentb1ae586ee1c7965d15ab2df22cca386dbf286a3a
Merge remote branch 'origin/cmakeport' into qmlintegration
src/application.h