Merge branch 'central-widget'master
commitebdda8c12dca4495d7f066261187e9d6c9fcfa9f
authorRiccardo Iaconelli <riccardo@kde.org>
Fri, 3 Aug 2007 22:37:54 +0000 (4 00:37 +0200)
committerRiccardo Iaconelli <riccardo@kde.org>
Fri, 3 Aug 2007 22:37:54 +0000 (4 00:37 +0200)
tree9c642df27bdc0d2ecd4283c42e0653e17fc94d61
parent36bb7db38a81c5eae931f9f9a25cc285f0e6ae6b
parentcc0b077931fea65570bfdf1c2c6ebfc37ce2a671
Merge branch 'central-widget'

Conflicts:

CMakeLists.txt