Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Wed, 8 Sep 2010 16:21:02 +0000 (18:21 +0200)
committerMilian Wolff <mail@milianw.de>
Wed, 8 Sep 2010 16:21:02 +0000 (18:21 +0200)
commit690bcda15ea9a35a4231d5e63b42e15b514871a3
tree07cfde1e1bb57e97396d95179ad95f6532ff3d1c
parent07c2d2f0214a0976fce24b9357c63c277c093029
parent126ecd5aa208691edd08413e011b35bb1e35704d
Merge branch '1.1'

Conflicts:
plugins/classbrowser/kdevclassbrowser.desktop
plugins/codeutils/kdevcodeutils.desktop
plugins/externalscript/kdevexternalscript.desktop
plugins/genericprojectmanager/kdevgenericmanager.desktop
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
plugins/classbrowser/kdevclassbrowser.desktop
plugins/externalscript/kdevexternalscript.desktop
plugins/genericprojectmanager/kdevgenericmanager.desktop
plugins/git/gitplugin.cpp
plugins/git/kdevgit.desktop
plugins/projectmanagerview/kdevprojectmanagerview.desktop
plugins/standardoutputview/kdevstandardoutputview.desktop
shell/kross/examples/bzrkdevelop/kdevbzr.desktop