Commits · master · Plasma / Plymouth KCM

03 Nov, 2020 1 commit

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

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

26d56f4a

23 Oct, 2020 1 commit
- Do not explicitely define Exec line for KCM · 09d84ed4
  Alexander Lohnau authored Oct 23, 2020
```
CCBUG: 398803
```
  09d84ed4
22 Oct, 2020 1 commit
- Now it depends against new version. Old code can be removed · 3b9a8712
  Laurent Montel authored Oct 22, 2020
  
  3b9a8712
15 Oct, 2020 1 commit

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

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

b74a20f6

21 Sep, 2020 1 commit
- Update version number for 5.20.80 · c831bd97
  Bhushan Shah authored Sep 21, 2020
```
GIT_SILENT
```
  c831bd97
20 Sep, 2020 1 commit

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

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

40c08708

19 Sep, 2020 1 commit

Misc cmake cleanup · 1982a51b

Nicolas Fella authored Sep 19, 2020

Remove some unneeded stuff. Condense calls where appropriate. Set C++ standard to 17 to follow other Plasma projects.

1982a51b

17 Sep, 2020 3 commits
- Update version number for 5.19.90 · d4667ed2
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  d4667ed2
- Update qt5 version requirement to 5.15.0 · 50d7410a
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  50d7410a
- Update kf5 version requirement to 5.74 · 683fd78e
  Bhushan Shah authored Sep 17, 2020
```
GIT_SILENT
```
  683fd78e
16 Sep, 2020 1 commit
- Remove explicit ECM_KDE_MODULE_DIR · a74b8a7e
  Laurent Montel authored Sep 16, 2020
  
  a74b8a7e
12 Sep, 2020 2 commits
- Fix clazy warnings about calling first() on temporary · 7594b041
  Alexander Lohnau authored Sep 12, 2020
  
  7594b041
- Use project version instead of undefined PLYMOUTH_KCM_VERSION · 8d1088c0
  Alexander Lohnau authored Sep 12, 2020
  
  8d1088c0
28 Aug, 2020 4 commits
- cmake: fix search for pkg-config · aca25cd6
  Pino Toscano authored Aug 28, 2020
```
properly use find_package() to search for it, making it required (as we
query for pkg-config variables)
```
  aca25cd6
- Merge remote-tracking branch 'origin/Plasma/5.19' into master · 22550126
  Pino Toscano authored Aug 28, 2020
  
  22550126
- Fix running of update-alternatives · d172c05e
  Alexander Lohnau authored Jul 17, 2020
```
(cherry picked from commit 1f91395d)
```
  d172c05e
- cmake: install plymouth.knsrc in newer ECM 5.58.0+ location · e4c0cf3f
  Pino Toscano authored Aug 28, 2020
```
plymouth-kcm already requires this version
```
  e4c0cf3f
28 Jul, 2020 1 commit
- Update version number for 5.19.4 · e75fe1e1
  Jonathan Riddell authored Jul 28, 2020
```
GIT_SILENT
```
  e75fe1e1
17 Jul, 2020 1 commit
- Fix running of update-alternatives · 1f91395d
  Alexander Lohnau authored Jul 17, 2020
  
  1f91395d
07 Jul, 2020 1 commit
- Update version number for 5.19.3 · 63ff8607
  Jonathan Riddell authored Jul 07, 2020
```
GIT_SILENT
```
  63ff8607
03 Jul, 2020 2 commits

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

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

78b56c7f

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

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

1e93b993

23 Jun, 2020 1 commit
- Update version number for 5.19.2 · 5343e726
  Jonathan Riddell authored Jun 23, 2020
```
GIT_SILENT
```
  5343e726
18 Jun, 2020 2 commits

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

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

55c43907

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

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

2c0467ae

17 Jun, 2020 2 commits

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

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

245e55b1

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

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

587dd028

16 Jun, 2020 1 commit
- Update version number for 5.19.1 · c7f1a231
  Jonathan Riddell authored Jun 16, 2020
```
GIT_SILENT
```
  c7f1a231
11 Jun, 2020 1 commit

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

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

e9e24e3d

09 Jun, 2020 1 commit

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

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

dd8df019

03 Jun, 2020 1 commit
- Update version number for 5.19.0 · 9aac5031
  Jonathan Riddell authored Jun 03, 2020
```
GIT_SILENT
```
  9aac5031
17 May, 2020 1 commit
- GIT_SILENT: we don't use phabricator now · a8046b14
  Laurent Montel authored May 17, 2020
  
  a8046b14
15 May, 2020 1 commit
- Update version number for 5.19.80 · 3c0c4272
  Jonathan Riddell authored May 15, 2020
```
GIT_SILENT
```
  3c0c4272
14 May, 2020 1 commit
- Update version number for 5.18.90 · 5be9f6f6
  Jonathan Riddell authored May 14, 2020
```
GIT_SILENT
```
  5be9f6f6
02 Apr, 2020 1 commit
- bump to require Qt 5.14 · fea7cb85
  Jonathan Riddell authored Apr 02, 2020
  
  fea7cb85
27 Mar, 2020 1 commit

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

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

9fb3fbc5

18 Mar, 2020 1 commit
- GIT_SILENT: Remove DISABLE_DEPRECATED_BEFORE macro. It can break compile when we increase KF5/Qt5 · 55500a93
  Laurent Montel authored Mar 18, 2020
  
  55500a93
04 Mar, 2020 1 commit
- Make it compile agaisnt qt5.15 · d9bcde42
  Laurent Montel authored Mar 04, 2020
  
  d9bcde42
16 Jan, 2020 2 commits
- Update version number for 5.18.80 · 2307c22f
  Jonathan Riddell authored Jan 16, 2020
```
GIT_SILENT
```
  2307c22f
- Update version number for 5.17.90 · 26f564f5
  Jonathan Riddell authored Jan 16, 2020
```
GIT_SILENT
```
  26f564f5