Commits · master · Plasma / Plasma Disks

20 May, 2022 1 commit

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

Script Kiddy authored May 20, 2022

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"

70d94bc2

19 May, 2022 2 commits
- Update version number for 5.25.80 · 16520e61
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  16520e61
- Update version number for 5.24.90 · 3160dcb6
  Jonathan Esk-Riddell authored May 19, 2022
```
GIT_SILENT
```
  3160dcb6
15 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 70787f1e
  Script Kiddy authored May 15, 2022
```
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"
```
  70787f1e
- GIT_SILENT made messages (after extraction) · 1537a112
  Script Kiddy authored May 15, 2022
  
  1537a112
03 May, 2022 1 commit
- Update version number for 5.24.5 · c4318311
  Jonathan Esk-Riddell authored May 03, 2022
```
GIT_SILENT
```
  c4318311
30 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · ede83b60
  Script Kiddy authored Mar 30, 2022
  
  ede83b60
29 Mar, 2022 2 commits
- Update version number for 5.24.4 · f4ac4cd0
  Jonathan Esk-Riddell authored Mar 29, 2022
```
GIT_SILENT
```
  f4ac4cd0
- GIT_SILENT made messages (after extraction) · bfcf9532
  Script Kiddy authored Mar 29, 2022
  
  bfcf9532
26 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · bb53c257
  Script Kiddy authored Mar 26, 2022
```
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"
```
  bb53c257
- GIT_SILENT made messages (after extraction) · 7383a456
  Script Kiddy authored Mar 26, 2022
  
  7383a456
23 Mar, 2022 1 commit

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

Script Kiddy authored Mar 23, 2022

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"

15b47752

20 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 390a9f17
  Script Kiddy authored Mar 20, 2022
  
  390a9f17
14 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 74a8f694
  Script Kiddy authored Mar 14, 2022
  
  74a8f694
11 Mar, 2022 1 commit

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

Script Kiddy authored Mar 11, 2022

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"

0a7005ef

08 Mar, 2022 1 commit
- Update version number for 5.24.3 · f7d3d348
  Jonathan Esk-Riddell authored Mar 08, 2022
```
GIT_SILENT
```
  f7d3d348
26 Feb, 2022 1 commit
- Use new kauth includes · e0e04cea
  Laurent Montel authored Feb 26, 2022
  
  e0e04cea
22 Feb, 2022 1 commit
- Update version number for 5.24.2 · d31787c5
  Jonathan Esk-Riddell authored Feb 22, 2022
```
GIT_SILENT
```
  d31787c5
18 Feb, 2022 1 commit
- compile fine without deprecated methods · eba7c19b
  Laurent Montel authored Feb 18, 2022
  
  eba7c19b
15 Feb, 2022 1 commit
- Update version number for 5.24.1 · 75e2b27e
  Jonathan Esk-Riddell authored Feb 15, 2022
```
GIT_SILENT
```
  75e2b27e
11 Feb, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 659aa097
  Script Kiddy authored Feb 11, 2022
  
  659aa097
28 Jan, 2022 3 commits
- Use new reuse-lint ci support · 97a09886
  Laurent Montel authored Jan 28, 2022
  
  97a09886
- Add CI qt6 support · 67ea1a43
  Laurent Montel authored Jan 28, 2022
  
  67ea1a43
- Make if compile against qt6 · 2761360f
  Laurent Montel authored Jan 28, 2022
  
  2761360f
13 Jan, 2022 2 commits
- Update version number for 5.24.80 · d6de6b08
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  d6de6b08
- Update version number for 5.23.90 · fedda7bc
  Jonathan Esk-Riddell authored Jan 13, 2022
```
GIT_SILENT
```
  fedda7bc
04 Jan, 2022 1 commit
- Update version number for 5.23.5 · 978c0a9c
  Jonathan Esk-Riddell authored Jan 04, 2022
```
GIT_SILENT
```
  978c0a9c
24 Dec, 2021 1 commit
- Compile fine without deprecated methods · 6bc2dfbf
  Laurent Montel authored Dec 24, 2021
  
  6bc2dfbf
11 Dec, 2021 1 commit
- Use Q_EMIT/Q_SLOTS · f1b16b84
  Laurent Montel authored Dec 11, 2021
  
  f1b16b84
30 Nov, 2021 1 commit
- Update version number for 5.23.4 · 840dc451
  Jonathan Esk-Riddell authored Nov 30, 2021
```
GIT_SILENT
```
  840dc451
09 Nov, 2021 1 commit
- Update version number for 5.23.3 · afc01809
  Jonathan Esk-Riddell authored Nov 09, 2021
```
GIT_SILENT
```
  afc01809
26 Oct, 2021 1 commit
- Update version number for 5.23.2 · 5f2a41ce
  Jonathan Esk-Riddell authored Oct 26, 2021
```
GIT_SILENT
```
  5f2a41ce
25 Oct, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 920ff2b7
  Script Kiddy authored Oct 25, 2021
  
  920ff2b7
24 Oct, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 9cfd8d3a
  Script Kiddy authored Oct 24, 2021
  
  9cfd8d3a
19 Oct, 2021 1 commit
- Update version number for 5.23.1 · 77533da8
  Jonathan Esk-Riddell authored Oct 19, 2021
```
GIT_SILENT
```
  77533da8
11 Oct, 2021 1 commit
- Update kf5 version requirement to 5.86 · 925c7eb4
  Jonathan Esk-Riddell authored Oct 11, 2021
```
GIT_SILENT
```
  925c7eb4
09 Oct, 2021 1 commit
- Install KCM in plasma/kinfocenter namespace · ab8778d9
  Alexander Lohnau authored Jul 30, 2021
```
Task: https://phabricator.kde.org/T14517
```
  ab8778d9
07 Oct, 2021 1 commit
- Update version number for 5.23.0 · 4b40035c
  Jonathan Esk-Riddell authored Oct 07, 2021
```
GIT_SILENT
```
  4b40035c
05 Oct, 2021 2 commits
- Add Linux CI · 312e1702
  Nicolas Fella authored Oct 05, 2021
  
  312e1702
- Add .kde-ci.yml · 961591fa
  Nicolas Fella authored Oct 05, 2021
  
  961591fa