Merge branch '4.1'
authorMilian Wolff <mail@milianw.de>
Mon, 13 Sep 2010 11:41:37 +0000 (13:41 +0200)
committerMilian Wolff <mail@milianw.de>
Mon, 13 Sep 2010 11:41:37 +0000 (13:41 +0200)
commita4599aa71af1e254219294f242979abfca859d07
tree881c168e3eb4ab641979e71c1cff45f3d57c8208
parent57db52992b65021841dd413e94df22ef090f93f0
parent0111bd4abeb277bf7999f83d1f95ef3df5d42dbf
Merge branch '4.1'

Conflicts:
documentation/qthelp/kdevqthelp.desktop
projectbuilders/cmakebuilder/kdevcmakebuilder.desktop
projectbuilders/makebuilder/kdevmakebuilder.desktop
projectmanagers/cmake/kdevcmakedocumentation.desktop
projectmanagers/cmake/kdevcmakemanager.desktop
projectmanagers/custommake/kdevcustommakemanager.desktop
providers/kdeprovider/kdevkdeprovider.desktop
utils/okteta/kdevokteta.desktop
documentation/qthelp/kdevqthelp.desktop
languages/cpp/cppduchain/tests/test_duchain.cpp
languages/cpp/cppduchain/tests/test_duchain.h
projectbuilders/cmakebuilder/kdevcmakebuilder.desktop
projectbuilders/makebuilder/kdevmakebuilder.desktop
projectmanagers/cmake/kdevcmakedocumentation.desktop
providers/kdeprovider/kdevkdeprovider.desktop
utils/okteta/kdevokteta.desktop