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 1 commit

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

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

25 Sep, 2019 2 commits

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

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

d9cec376

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

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

8a61cd18

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

30 Aug, 2019 1 commit

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

20 Aug, 2019 1 commit

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

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

c4c52bdd

05 Aug, 2019 1 commit

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

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

03743f7a

04 Aug, 2019 1 commit

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

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"

5a21d7b9

24 Jul, 2019 1 commit

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

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"

dc60b5bf

19 Jul, 2019 1 commit

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

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

0039ff4a

11 Jul, 2019 1 commit

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

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

1dc5bad6

29 Jun, 2019 1 commit

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

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

c9897e1e

25 Jun, 2019 1 commit

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

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

9d49fea0

24 Jun, 2019 1 commit

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

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

6779cc23

23 Jun, 2019 1 commit

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

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

9e4b9cb8

22 Jun, 2019 2 commits

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

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

b6616545

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

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

c39beacb

21 Jun, 2019 1 commit

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

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

2887f37b

20 Jun, 2019 1 commit

Rename Joystick KCM to Game Controller · 1c24138b

Noah Davis authored Jun 20, 2019

Summary: Most people will use it for calibrating game controllers and the icon was recently changed to a game controller.

Reviewers: #plasma, #vdg, ngraham

Reviewed By: #vdg, ngraham

Subscribers: ngraham, plasma-devel

Tags: #plasma

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

1c24138b

05 Nov, 2017 3 commits

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

Script Kiddy authored Nov 05, 2017

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"

3f257318

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

Script Kiddy authored Nov 05, 2017

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"

a399526d

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

Script Kiddy authored Nov 05, 2017

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"

bcaf56bd

26 Feb, 2017 3 commits

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

Script Kiddy authored Feb 26, 2017

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"

58a97def

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

Script Kiddy authored Feb 26, 2017

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"

77ec9961

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

Script Kiddy authored Feb 26, 2017

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"

a17afebe

11 Feb, 2017 2 commits

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

Script Kiddy authored Feb 11, 2017

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"

ee01448e

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

Script Kiddy authored Feb 11, 2017

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"

c395881f

10 Feb, 2017 1 commit

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

Script Kiddy authored Feb 10, 2017

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"

7e08e22f

20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

e9fee9c2

23 Jun, 2016 1 commit

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

Script Kiddy authored Jun 23, 2016

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"

90e5d413