Merge branch '4.1'
authorMilian Wolff <mail@milianw.de>
Sat, 13 Nov 2010 19:35:30 +0000 (20:35 +0100)
committerMilian Wolff <mail@milianw.de>
Sat, 13 Nov 2010 19:35:30 +0000 (20:35 +0100)
commitec5be80122a38f48c8b1b43107d3d5e58f49465b
tree3135895065e5676107bf825598334b54c7e95110
parent86be12944506fcab75736c781eb832b1393a3a62
parentcfa9707b2cbf6005f6781d687eeb01ce502df9fc
Merge branch '4.1'

Conflicts:
providers/kdeprovider/kdevkdeprovider.desktop
projectmanagers/custommake/projectfilesystemwatcher.cpp