Merge branch '4.1'
authorAleix Pol <aleixpol@kde.org>
Mon, 6 Sep 2010 22:38:29 +0000 (00:38 +0200)
committerAleix Pol <aleixpol@kde.org>
Mon, 6 Sep 2010 22:38:29 +0000 (00:38 +0200)
commit4c8d788d514f531d00deb1d9b34aed2a402aaf11
tree104b3788f9a8b284602706f4a6de3e177d828e4f
parent83607ec24c744038f9e020e8b85d32f352cb0e1e
parentc8efa00e1912eea4035f541523cce557d5c03258
Merge branch '4.1'
CMakeLists.txt
projectmanagers/cmake/cmakemanager.cpp
projectmanagers/cmake/cmakemanager.h