Commits · fe516fa3cade0f71d7169eff79a9e6480bfce5c0 · Friedrich W. H. Kossebau / kdevelop

14 Dec, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fe516fa3

Script Kiddy authored Dec 14, 2019

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"

fe516fa3

13 Dec, 2019 1 commit
- scratchpad: set icon in plugin metadata · 035dc4ac
  Friedrich W. H. Kossebau authored Dec 13, 2019
```
GIT_SILENT
```
  035dc4ac
11 Dec, 2019 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 10b5beff

Script Kiddy authored Dec 11, 2019

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"

10b5beff

SVN_SILENT made messages (.desktop file) - always resolve ours · 8c631f09

Script Kiddy authored Dec 11, 2019

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"

8c631f09

14 Sep, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 88cbd546

Script Kiddy authored Sep 14, 2019

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"

88cbd546

06 Sep, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · da75fda5

Script Kiddy authored Sep 06, 2019

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"

da75fda5

31 Aug, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c7254e73

Script Kiddy authored Aug 31, 2019

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"

c7254e73

29 Aug, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 58838e02

Script Kiddy authored Aug 29, 2019

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"

58838e02

17 Aug, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7b911c94

Script Kiddy authored Aug 17, 2019

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"

7b911c94

04 Aug, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · faaf6f48

Script Kiddy authored Aug 04, 2019

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"

faaf6f48

31 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 39d5a58c

Script Kiddy authored Jul 31, 2019

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"

39d5a58c

28 Jul, 2019 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · e3ecca4c

Script Kiddy authored Jul 28, 2019

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"

e3ecca4c

SVN_SILENT made messages (.desktop file) - always resolve ours · 81719b97

Script Kiddy authored Jul 28, 2019

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"

81719b97

26 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2f806c3d

Script Kiddy authored Jul 26, 2019

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"

2f806c3d

25 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9799b6cc

Script Kiddy authored Jul 25, 2019

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"

9799b6cc

24 Jul, 2019 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · d2f4fc35

Script Kiddy authored Jul 24, 2019

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"

d2f4fc35

SVN_SILENT made messages (.desktop file) - always resolve ours · 15873f22

Script Kiddy authored Jul 24, 2019

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"

15873f22

23 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d0260704

Script Kiddy authored Jul 23, 2019

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"

d0260704

22 Jul, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 8fa9c17e

Script Kiddy authored Jul 22, 2019

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"

8fa9c17e

03 Jun, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e4aa40fc

Script Kiddy authored Jun 03, 2019

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"

e4aa40fc

02 Apr, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · aa65399a

Script Kiddy authored Apr 02, 2019

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"

aa65399a

25 Mar, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7171ab04

Script Kiddy authored Mar 25, 2019

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"

7171ab04

01 Feb, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 451c3868

Script Kiddy authored Feb 01, 2019

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"

451c3868

21 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 37cc98f3

Script Kiddy authored Jan 21, 2019

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"

37cc98f3

07 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c25f3483

Script Kiddy authored Jan 07, 2019

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"

c25f3483

28 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 8f7165bc

Script Kiddy authored Dec 28, 2018

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"

8f7165bc

17 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 66e6e472

Script Kiddy authored Dec 17, 2018

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"

66e6e472

13 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · cd4e03c2

Script Kiddy authored Dec 13, 2018

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"

cd4e03c2

11 Dec, 2018 1 commit

Add scratchpad plugin · 37f68b8d

Amish Naidu authored Dec 11, 2018

Summary:
Adds a scratchpad plugin, which allows you to keep "scratches" of code/text
to experiment or quickly run something without the need for a project.
The plugin adds a new tool-view, which will maintain a list of your scratches
as well as allowing you to compile and run them.
The scratches live in the directory `scratches` in the data directory and
are regular documents so we get all the editing convenience of code-completion
and diagnostics.
Commands used to run them are saved per-scratches and new scratches use the last
used command for that file type/suffix.

FEATURE: 176389

Test Plan:
Add the tool-view on the left tool bar and try creating and using the scratches.
Currently no automated tests.

Reviewers: #kdevelop, kfunk

Reviewed By: #kdevelop, kfunk

Subscribers: aaronpuchert, kfunk, gregormi, brauch, kdevelop-devel

Tags: #kdevelop

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

37f68b8d