Merge branch '4.2' of git://anongit.kde.org/kdevelop into 4.2
author Aleix Pol
()
committer Aleix Pol
()
commit 2ba1da47c99728c19b053fa1283e9939590ae8a0
tree 0c7698d95e1635dfcd1a2133bfa1053ab7044f9f
parent 189312d3faa408a8fe662e64daf9c6f8aa55b082
parent 8153365a142a9d0997c49e78a831fafc64eb36a5
Merge branch '4.2' of git://anongit.kde.org/kdevelop into 4.2
projectbuilders/cmakebuilder/cmakejob.cpp
projectmanagers/cmake/cmakedocumentation.cpp