Merge branch 'master' of git://anongit.kde.org/kdevelop
authorAleix Pol <aleixpol@kde.org>
Tue, 8 Mar 2011 02:21:06 +0000 (03:21 +0100)
committerAleix Pol <aleixpol@kde.org>
Tue, 8 Mar 2011 02:21:06 +0000 (03:21 +0100)
commit158da89efde2af530979fd10ce969579fade4a31
tree409abcc7eb7b2d520fdf72dd8d29782c160b3e82
parentbe99988b78685fdfa2578ee9d4f5c555d2125485
parent90c6f8d1a8a12dc03b6fe76da0410d8f80314ffb
Merge branch 'master' of git://anongit.kde.org/kdevelop
projectbuilders/cmakebuilder/cmakejob.cpp