Commits · 38a874ab82aac7666377b06234788f909991cf1c · Plasma / Plasma Desktop

23 Mar, 2020 1 commit

[KCM Spellchecking] port to KPropertySkeletonItem · 38a874ab

Benjamin Port authored Feb 19, 2020

Reviewers: #plasma, meven, crossi, ervin

Subscribers: plasma-devel

Tags: #plasma

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

38a874ab

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

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

16 Dec, 2019 1 commit

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

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

ee95e76d

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

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

03 Jun, 2019 1 commit
- Fix forward declaration · 9aa8efc5
  Laurent Montel authored Jun 03, 2019
  
  9aa8efc5
01 Mar, 2019 1 commit
- Remove deprecated method · 64c56e73
  Laurent Montel authored Mar 01, 2019
  
  64c56e73
22 Jan, 2019 1 commit

Remove dependency on KDELibs4Support for some KCM modules · ed840a53

Alexander Volkov authored Jan 22, 2019

Reviewers: broulik

Reviewed By: broulik

Subscribers: broulik, plasma-devel

Tags: #plasma

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

ed840a53

16 Nov, 2018 1 commit
- clang-tidy: use-modernize-override run · 52bf6bec
  Kevin Funk authored Nov 16, 2018
```
... to make Clang a bit more happy
```
  52bf6bec
18 Jun, 2018 3 commits

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

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

b7c412b8

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

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

9d7b98b8

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

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

f9a8b977

11 May, 2018 2 commits

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

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

0d8189e9

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

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

1f972959

08 May, 2018 2 commits

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

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

30e2e542

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

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

abdae464

15 Feb, 2018 1 commit
- Use non-deprecated KDEInstallDirs variables · 2fc98d5e
  Friedrich W. H. Kossebau authored Feb 15, 2018
  
  2fc98d5e
29 Jan, 2018 1 commit
- Use override as we already use it in repo · c143d698
  Laurent Montel authored Jan 29, 2018
  
  c143d698
02 Jun, 2017 1 commit
- Use Q_DECL_OVERRIDE · 44051d03
  Laurent Montel authored Jun 02, 2017
  
  44051d03
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

09 Aug, 2016 1 commit

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

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

28e6206b

23 Jun, 2016 2 commits

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

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

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"

40925ab7

31 May, 2016 1 commit

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

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

0f07e8bc

14 Feb, 2016 1 commit

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

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

77d7c656

31 Jan, 2016 1 commit

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

Script Kiddy authored Jan 31, 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"

acb27c48

23 Jan, 2016 2 commits
- SVN_SILENT made messages (.desktop file) · 6f57bbcc
  Script Kiddy authored Jan 23, 2016
  
  6f57bbcc
- SVN_SILENT made messages (.desktop file) - always resolve ours · 79ac74c5
  Script Kiddy authored Jan 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"
```
  79ac74c5