Commits · master · Utilities / KWalletManager

18 Jan, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 449aa6e9
  Script Kiddy authored Jan 18, 2021
  
  449aa6e9
02 Jan, 2021 3 commits
- GIT_SILENT Update Appstream for new release · b75dd67b
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit 01fc83da)
```
  b75dd67b
- SVN_SILENT made messages (.desktop file) - always resolve ours · 518fe706
  Script Kiddy authored Jan 02, 2021
```
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"
```
  518fe706
- GIT_SILENT made messages (after extraction) · c51a8548
  Script Kiddy authored Jan 02, 2021
  
  c51a8548
01 Jan, 2021 1 commit
- Add missing override · 679769dc
  Laurent Montel authored Jan 01, 2021
  
  679769dc
30 Dec, 2020 1 commit
- Not necessary now · 7508ab11
  Laurent Montel authored Dec 30, 2020
  
  7508ab11
29 Dec, 2020 2 commits
- Convert license statements to SPDX expressions · 89e8a88e
  Laurent Montel authored Dec 29, 2020
  
  89e8a88e
- Autogenerate categories file · 9f23a8f6
  Laurent Montel authored Dec 29, 2020
  
  9f23a8f6
21 Dec, 2020 1 commit

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

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

f6057cf7

09 Dec, 2020 1 commit
- operator+/- is disabled for QFlags in qt6 · 216fda1e
  Laurent Montel authored Dec 09, 2020
  
  216fda1e
02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 7c9de957
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit 85730faa)
```
  7c9de957
29 Nov, 2020 1 commit
- Remove unused include · 3702d97e
  Nicolas Fella authored Nov 29, 2020
  
  3702d97e
16 Nov, 2020 1 commit

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

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

b5da4828

08 Nov, 2020 1 commit
- GIT_SILENT Upgrade release service version to 21.03.70. · 99d16483
  Albert Astals Cid authored Nov 08, 2020
  
  99d16483
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 49e3861b
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit b3dbccdf)
```
  49e3861b
23 Oct, 2020 1 commit

Use systemsettings5 for Exec line · 707f0e3f

Alexander Lohnau authored Oct 23, 2020

Because the latest KF5 version is not required systemsettings5 is
hardcoded for the Exec line instead of the generated fallback.

CCBUG: 398803

707f0e3f

22 Oct, 2020 1 commit
- If include is define in .h remove it if it's defined in .cpp too (scripted) · 1dd99198
  Laurent Montel authored Oct 22, 2020
  
  1dd99198
09 Oct, 2020 1 commit

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

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

3ac4b18c

03 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 916f6042
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit a0775561)
```
  916f6042
28 Sep, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 54c13dfd
  Script Kiddy authored Sep 28, 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"
```
  54c13dfd
- GIT_SILENT made messages (after extraction) · 238278e5
  Script Kiddy authored Sep 28, 2020
  
  238278e5
21 Sep, 2020 1 commit

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

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

451628a4

19 Sep, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 909a5347
  Script Kiddy authored Sep 19, 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"
```
  909a5347
- GIT_SILENT made messages (after extraction) · 3d62d039
  Script Kiddy authored Sep 19, 2020
  
  3d62d039
06 Sep, 2020 1 commit

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

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

2ffc29a0

05 Sep, 2020 1 commit

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

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

9aac25e7

01 Sep, 2020 1 commit

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

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

c227db82

31 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · b89c89ab
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit bce89f8b)
```
  b89c89ab
29 Aug, 2020 1 commit

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

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

0ef6dd07

27 Aug, 2020 1 commit

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

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

6f0a2d62

24 Aug, 2020 1 commit

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

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

b081405c

20 Aug, 2020 1 commit
- Merge remote-tracking branch 'origin/release/20.08' into master · 42da7a66
  Albert Astals Cid authored Aug 20, 2020
  
  42da7a66
13 Aug, 2020 1 commit

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

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

1b29c956

12 Aug, 2020 3 commits
- Fix memory leak · 848ee264
  Albert Astals Cid authored Aug 12, 2020
  
  848ee264
- Port away from deprecated KToolInvocation::startServiceByDesktopName · 72a36a4c
  Nicolas Fella authored Aug 12, 2020
  
  72a36a4c
- Remove unused include · dfe5a947
  Nicolas Fella authored Aug 12, 2020
  
  dfe5a947
05 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · b8ade4b9
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 7592e09d)
```
  b8ade4b9
- GIT_SILENT Update Appstream for new release · 7592e09d
  Christoph Feck authored Aug 05, 2020
  
  7592e09d
- GIT_SILENT Upgrade release service version to 20.08.0. · 0290382a
  Christoph Feck authored Aug 05, 2020
  
  0290382a
31 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.90. · 72317acd
  Christoph Feck authored Jul 31, 2020
  
  72317acd