Merge branch '1.1'
authorAleix Pol <aleixpol@kde.org>
Mon, 13 Sep 2010 23:31:40 +0000 (01:31 +0200)
committerAleix Pol <aleixpol@kde.org>
Mon, 13 Sep 2010 23:31:40 +0000 (01:31 +0200)
commit465b3adb8b8181065efd108debc167e4915e0289
tree05f49876e3cd910b1433ec7b355220dc10e08872
parent8815a9a3765ecbeadf3c3cd8169d85e443c52a48
parentea9f0d2203b5057bd2d275e15bc2a90f09535e9f
Merge branch '1.1'

Conflicts:
plugins/classbrowser/kdevclassbrowser.desktop
plugins/codeutils/kdevcodeutils.desktop
plugins/externalscript/kdevexternalscript.desktop
plugins/genericprojectmanager/kdevgenericmanager.desktop
plugins/git/gitplugin.cpp
plugins/git/kdevgit.desktop
plugins/pastebin/kdevpastebin.desktop
plugins/projectmanagerview/kdevprojectmanagerview.desktop
plugins/reviewboard/kdevreviewboard.desktop
plugins/standardoutputview/kdevstandardoutputview.desktop
shell/kross/examples/bzrkdevelop/kdevbzr.desktop
shell/workingsetcontroller.cpp
plugins/classbrowser/kdevclassbrowser.desktop
plugins/codeutils/kdevcodeutils.desktop
plugins/git/gitplugin.cpp
plugins/git/gitplugin.h
plugins/git/kdevgit.desktop
plugins/pastebin/kdevpastebin.desktop
plugins/standardoutputview/kdevstandardoutputview.desktop
shell/kross/examples/bzrkdevelop/kdevbzr.desktop
shell/projectcontroller.cpp