Merge branch '1.1', turn check for SmartInterface into check for MovingInterface
authorMilian Wolff <mail@milianw.de>
Thu, 9 Sep 2010 13:41:33 +0000 (15:41 +0200)
committerMilian Wolff <mail@milianw.de>
Thu, 9 Sep 2010 13:41:33 +0000 (15:41 +0200)
commitf54ad9a6305c400fed4c934011f0af56b2e55edc
treefb05a9cf929455e2f0a857b550d6b0c6a4050174
parent7c0034bf7b08e7f585b7fd7f79b5612db1f0adc8
parent602f04ae1412715493dc04a30c9841075e194c04
Merge branch '1.1', turn check for SmartInterface into check for MovingInterface

Conflicts:
plugins/classbrowser/kdevclassbrowser.desktop
plugins/codeutils/kdevcodeutils.desktop
plugins/externalscript/kdevexternalscript.desktop
plugins/pastebin/kdevpastebin.desktop
plugins/projectmanagerview/kdevprojectmanagerview.desktop
plugins/reviewboard/kdevreviewboard.desktop
plugins/standardoutputview/kdevstandardoutputview.desktop
shell/core.cpp
shell/kross/examples/bzrkdevelop/kdevbzr.desktop
shell/core.cpp