Commits · ab4d39ef40758532e96ae5f3762dca827a74aaf4 · Plasma / Plymouth KCM

31 Mar, 2020 1 commit
- Update version number for 5.18.4 · ab4d39ef
  Jonathan Esk-Riddell authored Mar 31, 2020
```
GIT_SILENT
```
  ab4d39ef
10 Mar, 2020 1 commit
- Update version number for 5.18.3 · d381cde3
  Jonathan Esk-Riddell authored Mar 10, 2020
```
GIT_SILENT
```
  d381cde3
02 Mar, 2020 1 commit
- Only deprecate up to target frameworks · 0d2e9d06
  David Edmundson authored Mar 02, 2020
  
  0d2e9d06
25 Feb, 2020 1 commit
- Update version number for 5.18.2 · 058741f1
  Jonathan Esk-Riddell authored Feb 25, 2020
```
GIT_SILENT
```
  058741f1
18 Feb, 2020 1 commit
- Update version number for 5.18.1 · 1f613bea
  Jonathan Esk-Riddell authored Feb 18, 2020
```
GIT_SILENT
```
  1f613bea
06 Feb, 2020 1 commit
- Update version number for 5.18.0 · a852b099
  Jonathan Esk-Riddell authored Feb 06, 2020
```
GIT_SILENT
```
  a852b099
16 Jan, 2020 2 commits
- Update version number for 5.17.90 · 26f564f5
  Jonathan Esk-Riddell authored Jan 16, 2020
```
GIT_SILENT
```
  26f564f5
- KF5_MIN_VERSION for plasma 5.18 is KF5 5.66.0 · 5dfcde4f
  Jonathan Esk-Riddell authored Jan 16, 2020
  
  5dfcde4f
27 Dec, 2019 1 commit

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

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

9f343b0e

26 Dec, 2019 3 commits

Merge branch 'Plasma/5.17' · deb44118
Nate Graham authored Dec 26, 2019

deb44118

Don't use qmlRegisterType with QT-5.14 · 92ffa670

Peter Levine authored Dec 26, 2019 and

Nate Graham committed Dec 26, 2019

Summary:
Building Plymouth-kcm-5.17.3 against Qt 5.14.0_beta3 fails to build.

I don't have much experience with QT/KDE programming but these
changes are sufficient to fix the build error on my end.

BUG: 414679

Reviewers: jriddell, #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: zzag, davidedmundson, asturmlechner, plasma-devel

Tags: #plasma

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

92ffa670

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

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

825e5a41

10 Dec, 2019 1 commit

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

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

10f1e7c9

03 Dec, 2019 1 commit
- Update version number for 5.17.4 · e4d4275b
  Jonathan Esk-Riddell authored Dec 03, 2019
```
GIT_SILENT
```
  e4d4275b
02 Dec, 2019 1 commit

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

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

2bacb0f5

01 Dec, 2019 1 commit
- Fix compilation with Qt 5.14, because of qmlRegisterType being deprecated · 849ac4d0
  David Faure authored Dec 01, 2019
  
  849ac4d0
23 Nov, 2019 2 commits

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

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

edbc8890

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

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

ae1c7aac

13 Nov, 2019 1 commit
- GIT_SILENT: It compiles fine without deprecated methods · 1f8831d9
  Laurent Montel authored Nov 13, 2019
  
  1f8831d9
12 Nov, 2019 1 commit
- Update version number for 5.17.3 · df83cc7a
  Jonathan Esk-Riddell authored Nov 12, 2019
```
GIT_SILENT
```
  df83cc7a
09 Nov, 2019 1 commit

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

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

1dc78dc4

04 Nov, 2019 1 commit

Add KDEClangFormat cmake support · 2e98cd15

David Edmundson authored Nov 04, 2019

Summary:
This allows devs to run: "make clang-format" and format all files easily
using the preset KDE clang format style

This patch adds support so devs can easily test the intended formatting
now, it doesn't change the code yet.

Doing an initial run to commit everything will happen later.

Test Plan:
Ran script
git diff was full of amazingly cleaned code

See D25134

2e98cd15

29 Oct, 2019 1 commit
- Update version number for 5.17.2 · 22ea4e8f
  Jonathan Esk-Riddell authored Oct 29, 2019
```
GIT_SILENT
```
  22ea4e8f
22 Oct, 2019 1 commit
- Update version number for 5.17.1 · 08f5bacb
  Jonathan Esk-Riddell authored Oct 22, 2019
```
GIT_SILENT
```
  08f5bacb
11 Oct, 2019 1 commit

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

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

80d65711

10 Oct, 2019 1 commit
- Update version number for 5.17.0 · 8d96ca0d
  Jonathan Esk-Riddell authored Oct 10, 2019
```
GIT_SILENT
```
  8d96ca0d
07 Oct, 2019 1 commit

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

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

60e292b9

06 Oct, 2019 1 commit

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

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

f9b65fbf

25 Sep, 2019 2 commits

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

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"

27f83eb4

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

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"

98d44397

19 Sep, 2019 3 commits
- Update version number for 5.17.80 · 4215e7d1
  Jonathan Esk-Riddell authored Sep 19, 2019
```
GIT_SILENT
```
  4215e7d1
- Update version number for 5.16.90 · a8b19aa3
  Jonathan Esk-Riddell authored Sep 19, 2019
```
GIT_SILENT
```
  a8b19aa3
- update to latest kf5 dependency · 013b610d
  Jonathan Esk-Riddell authored Sep 19, 2019
  
  013b610d
14 Sep, 2019 1 commit

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

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"

715fba8b

31 Aug, 2019 1 commit

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

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"

4f0aba45

30 Aug, 2019 1 commit

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

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"

01a5f714

23 Aug, 2019 1 commit

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

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

49e38230

20 Aug, 2019 1 commit

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

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"

7d76b41a

17 Aug, 2019 1 commit

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

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"

7c582483

11 Aug, 2019 1 commit

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

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

7ee44ba1