Commits · master · Utilities / KWalletManager

03 Feb, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 45193bdd
  Script Kiddy authored Feb 03, 2023
  
  45193bdd
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2837d62b
  Script Kiddy authored Feb 03, 2023
```
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"
```
  2837d62b
02 Feb, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 2fbf052c
  Script Kiddy authored Feb 02, 2023
  
  2fbf052c
- SVN_SILENT made messages (.desktop file) - always resolve ours · adb4d093
  Script Kiddy authored Feb 02, 2023
```
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"
```
  adb4d093
31 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 1a49cdac
  Script Kiddy authored Jan 31, 2023
  
  1a49cdac
30 Jan, 2023 5 commits
- Initialize pointer · 33b15db9
  Laurent Montel authored Jan 30, 2023
  
  33b15db9
- initialize pointer · 079c35f9
  Laurent Montel authored Jan 30, 2023
  
  079c35f9
- Move as private · 374fd303
  Laurent Montel authored Jan 30, 2023
  
  374fd303
- Const'ify pointer · 4e5af19d
  Laurent Montel authored Jan 30, 2023
  
  4e5af19d
- GIT_SILENT Sync po/docbooks with svn · 5310720e
  Script Kiddy authored Jan 30, 2023
  
  5310720e
29 Jan, 2023 2 commits
- GIT_SILENT Update Appstream for new release · dbfaf989
  Heiko Becker authored Jan 29, 2023
```
(cherry picked from commit 4b3c68f0)
```
  dbfaf989
- Allow to build against kf6 · fa8bea66
  Laurent Montel authored Jan 29, 2023
  
  fa8bea66
25 Jan, 2023 1 commit

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

Script Kiddy authored Jan 25, 2023

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"

aff4aa36

22 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 3f9d90d5
  Script Kiddy authored Jan 22, 2023
  
  3f9d90d5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6d2f4775
  Script Kiddy authored Jan 22, 2023
```
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"
```
  6d2f4775
20 Jan, 2023 1 commit
- Use versionpostfixless KF requirement variable name · 315fba5e
  Laurent Montel authored Jan 20, 2023
  
  315fba5e
19 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 808dd899
  Script Kiddy authored Jan 19, 2023
  
  808dd899
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6cd80859
  Script Kiddy authored Jan 19, 2023
```
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"
```
  6cd80859
18 Jan, 2023 1 commit

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

Script Kiddy authored Jan 18, 2023

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"

b8d4920c

17 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 1c099b97
  Script Kiddy authored Jan 17, 2023
  
  1c099b97
- SVN_SILENT made messages (.desktop file) - always resolve ours · 51367e74
  Script Kiddy authored Jan 17, 2023
```
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"
```
  51367e74
16 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 3593082c
  Script Kiddy authored Jan 16, 2023
  
  3593082c
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6dccb079
  Script Kiddy authored Jan 16, 2023
```
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"
```
  6dccb079
15 Jan, 2023 1 commit

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

Script Kiddy authored Jan 15, 2023

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"

5edfb0dc

14 Jan, 2023 3 commits

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

Script Kiddy authored Jan 14, 2023

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"

bda02830

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

Script Kiddy authored Jan 14, 2023

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"

f16d525f

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

Script Kiddy authored Jan 14, 2023

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"

0f17f46d

13 Jan, 2023 3 commits
- Port KCMs to new install location and embed json metadata · 19a895a9
  Alexander Lohnau authored Jan 11, 2023 and Luigi Toscano committed Jan 14, 2023
```
Task: https://phabricator.kde.org/T14517

Relates to plasma/systemsettings!138
```
  19a895a9
- GIT_SILENT Sync po/docbooks with svn · 9f378961
  Script Kiddy authored Jan 13, 2023
  
  9f378961
- SVN_SILENT made messages (.desktop file) - always resolve ours · ec19deeb
  Script Kiddy authored Jan 13, 2023
```
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"
```
  ec19deeb
07 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · eed7c8a1
  Script Kiddy authored Jan 07, 2023
  
  eed7c8a1
06 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · e6222375
  Script Kiddy authored Jan 06, 2023
  
  e6222375
04 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 42e8fa6f
  Script Kiddy authored Jan 04, 2023
  
  42e8fa6f
03 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · bf76cdf3
  Script Kiddy authored Jan 03, 2023
  
  bf76cdf3
02 Jan, 2023 1 commit
- GIT_SILENT Update Appstream for new release · f7c3d44b
  Albert Astals Cid authored Jan 03, 2023
```
(cherry picked from commit 3a6ff1a5)
```
  f7c3d44b
01 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · bbc3d77f
  Script Kiddy authored Jan 01, 2023
  
  bbc3d77f
- SVN_SILENT made messages (.desktop file) - always resolve ours · 87cc51ad
  Script Kiddy authored Jan 01, 2023
```
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"
```
  87cc51ad
31 Dec, 2022 2 commits
- GIT_SILENT Sync po/docbooks with svn · 20f127b0
  Script Kiddy authored Dec 31, 2022
  
  20f127b0
- GIT_SILENT made messages (after extraction) · 59032280
  Script Kiddy authored Dec 31, 2022
  
  59032280
30 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 742af579
  Script Kiddy authored Dec 30, 2022
  
  742af579