Merge branch '4.2' of git://anongit.kde.org/kdevelop into 4.2
authorAleix Pol <aleixpol@kde.org>
Tue, 8 Mar 2011 02:21:14 +0000 (03:21 +0100)
committerAleix Pol <aleixpol@kde.org>
Tue, 8 Mar 2011 02:21:14 +0000 (03:21 +0100)
commit2ba1da47c99728c19b053fa1283e9939590ae8a0
tree0c7698d95e1635dfcd1a2133bfa1053ab7044f9f
parent189312d3faa408a8fe662e64daf9c6f8aa55b082
parent8153365a142a9d0997c49e78a831fafc64eb36a5
Merge branch '4.2' of git://anongit.kde.org/kdevelop into 4.2
projectbuilders/cmakebuilder/cmakejob.cpp