Merge branch '4.2'
author Aleix Pol
()
committer Aleix Pol
()
commit be99988b78685fdfa2578ee9d4f5c555d2125485
tree 8f7809aa978c1061119bc0a35f7a4209f81e1016
parent 9a4369b7609bcfac5805a289d0451db07e529c81
parent 189312d3faa408a8fe662e64daf9c6f8aa55b082
Merge branch '4.2'
projectbuilders/cmakebuilder/cmakejob.cpp
projectmanagers/cmake/cmakecodecompletionmodel.cpp