Merge branch '4.1'
authorMilian Wolff <mail@milianw.de>
Wed, 8 Sep 2010 16:18:42 +0000 (18:18 +0200)
committerMilian Wolff <mail@milianw.de>
Wed, 8 Sep 2010 16:18:42 +0000 (18:18 +0200)
commit80ac14901edeaadabbed119be3da2f1537bfb522
tree9be9d5fa35d8e3b9af015be0d8e5d8f41a7f5fe6
parentb4fbf4f8516b233e1fc081f370e88a91301066b1
parent243a874e79cd03c82e6621b46dcb9b9340d771ec
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/cmake/tests/manual/kde4app/kde4app.desktop
projectmanagers/custommake/kdevcustommakemanager.desktop
providers/kdeprovider/kdevkdeprovider.desktop
utils/okteta/kdevokteta.desktop
CMakeLists.txt
documentation/qthelp/kdevqthelp.desktop
projectbuilders/cmakebuilder/kdevcmakebuilder.desktop
projectbuilders/makebuilder/kdevmakebuilder.desktop
projectmanagers/cmake/kdevcmakedocumentation.desktop
projectmanagers/cmake/kdevcmakemanager.desktop
projectmanagers/cmake/tests/manual/kde4app/kde4app.desktop
projectmanagers/custommake/kdevcustommakemanager.desktop
providers/kdeprovider/kdevkdeprovider.desktop