Commits · f32f0f0c392d419e858024ef22190fdeebb7a793 · Plasma / Plasma Desktop

11 Feb, 2020 1 commit

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

Script Kiddy authored Feb 11, 2020

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"

f32f0f0c

21 Jan, 2020 1 commit

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

Script Kiddy authored Jan 21, 2020

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"

5203edab

18 Jan, 2020 2 commits

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

Script Kiddy authored Jan 18, 2020

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"

58bee891

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

Script Kiddy authored Jan 18, 2020

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"

9f7b53b5

16 Jan, 2020 1 commit

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

Script Kiddy authored Jan 16, 2020

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"

e21b9eae

06 Jan, 2020 2 commits

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

Script Kiddy authored Jan 06, 2020

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"

142e6c95

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

Script Kiddy authored Jan 06, 2020

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"

22046a9f

30 Dec, 2019 1 commit

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

Script Kiddy authored Dec 30, 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"

d88f5578

17 Nov, 2019 1 commit

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

Script Kiddy authored Nov 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"

fe32ccf4

05 Nov, 2019 1 commit

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

Script Kiddy authored Nov 05, 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"

6569912f

31 Oct, 2019 1 commit

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

Script Kiddy authored Oct 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"

f0502407

23 Oct, 2019 1 commit

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

Script Kiddy authored Oct 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"

8a5439f8

24 Sep, 2019 1 commit

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

Script Kiddy authored Sep 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"

95595293

09 Sep, 2019 1 commit

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

Script Kiddy authored Sep 09, 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"

93ef4b80

07 Sep, 2019 1 commit

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

Script Kiddy authored Sep 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"

83a81b95

06 Sep, 2019 1 commit

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

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"

97a4fec0

05 Sep, 2019 1 commit

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

Script Kiddy authored Sep 05, 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"

ecdfe134

03 Sep, 2019 1 commit

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

Script Kiddy authored Sep 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"

1121b3b6

02 Sep, 2019 1 commit

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

Script Kiddy authored Sep 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"

23f7ef58

01 Sep, 2019 1 commit

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

Script Kiddy authored Sep 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"

81bfe750

31 Aug, 2019 1 commit

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

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"

ac2a78aa

30 Aug, 2019 2 commits

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

Script Kiddy authored Aug 30, 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"

24ec9049

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

Script Kiddy authored Aug 30, 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"

9ea7b18a

01 Aug, 2019 1 commit

Move KCMs in "Workspace Theme" to more appropriate locations · 09a64755

Nate Graham authored Aug 01, 2019

Summary:
This is patch one out of three in support of the new {nav Appearance} section layout in Plasma 5.16 decided upon on in {T8871}.

In this patch, KCMs are moved out of the {nav Workspace Theme} category, and the ordering of some KCMs is changed accordingly. The now-empty category gets deleted in D18417.

Test Plan:
{F7134495}

{F7134503}

Reviewers: #vdg, #plasma, davidedmundson, filipf

Reviewed By: #vdg, filipf

Subscribers: filipf, GB_2, abetts, davidedmundson, plasma-devel

Tags: #plasma

Maniphest Tasks: T8871

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

09a64755

26 May, 2019 2 commits

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

Script Kiddy authored May 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"

960931fe

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

Script Kiddy authored May 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"

b6bf2686

16 May, 2019 1 commit

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

Script Kiddy authored May 16, 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"

893a4121

28 Apr, 2019 2 commits

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

Script Kiddy authored Apr 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"

0a139fc5

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

Script Kiddy authored Apr 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"

6e8e455a

22 Apr, 2019 1 commit

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

Script Kiddy authored Apr 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"

d47c8bde

18 Apr, 2019 1 commit

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

Script Kiddy authored Apr 18, 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"

b214da5e

12 Apr, 2019 2 commits

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

Script Kiddy authored Apr 12, 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"

8c811e78

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

Script Kiddy authored Apr 12, 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"

78c7ca72

25 Mar, 2019 2 commits

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

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"

95759c8e

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

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"

f65dd514

23 Mar, 2019 1 commit

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

Script Kiddy authored Mar 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"

2760c91a

19 Mar, 2019 1 commit

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

Script Kiddy authored Mar 19, 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"

0333058f

08 Mar, 2019 1 commit

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

Script Kiddy authored Mar 08, 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"

24983b21

03 Mar, 2019 1 commit

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

Script Kiddy authored Mar 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"

3815cc8a

26 Feb, 2019 1 commit

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

Script Kiddy authored Feb 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"

1dc17a92