GitLab

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

KProcess::execute(...) by default waits indefinitely. Set a timeout.
(cherry picked from commit a485241c96e221f3844d96f35a94a37752be7d6b)

Summary:
Someone changed the test clients without adapting the GDB printer
tests...

Reviewers: #kdevelop

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D9923

(cherry picked from commit f4dd6425)

Reviewers: #kdevelop

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D9924

(cherry picked from commit a6093e7e)

(cherry picked from commit c917ebbe)

We require at least 3.0 now anyway

Summary: Use kdevelop.plugins.$PLUGINNAME

Reviewers: mwolff, brauch

Reviewed By: mwolff, brauch

Subscribers: brauch, kdevelop-devel

Differential Revision: https://phabricator.kde.org/D8045

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

As discussed on the mailing list:
  https://mail.kde.org/pipermail/kdevelop-devel/2017-September/058823.html

Move all plugins into a single folder:
- $CATEGORY/$PLUGINFOLDER -> plugins/$PLUGINFOLDER
- kdevplatform/plugins/$PLUGINFOLDER -> plugins/$PLUGINFOLDER