Commits · master · Plasma / Plasma Bigscreen

09 Feb, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 480f3fe3
  Script Kiddy authored Feb 09, 2023
  
  480f3fe3
08 Feb, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 41e6abf7
  Script Kiddy authored Feb 08, 2023
  
  41e6abf7
07 Feb, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 4fc710e8
  Script Kiddy authored Feb 07, 2023
  
  4fc710e8
06 Feb, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · aef5165a
  Script Kiddy authored Feb 06, 2023
  
  aef5165a
02 Feb, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · ec9db9d6
  Script Kiddy authored Feb 02, 2023
  
  ec9db9d6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7e4d8f6f
  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"
```
  7e4d8f6f
30 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 3053fabd
  Script Kiddy authored Jan 30, 2023
  
  3053fabd
29 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · f61210d6
  Script Kiddy authored Jan 29, 2023
  
  f61210d6
- SVN_SILENT made messages (.desktop file) - always resolve ours · b4d938a3
  Script Kiddy authored Jan 29, 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"
```
  b4d938a3
27 Jan, 2023 1 commit
- Update version number for 5.27.80 · 7ec6eddb
  Jonathan Esk-Riddell authored Jan 27, 2023
```
GIT_SILENT
```
  7ec6eddb
25 Jan, 2023 1 commit

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

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"

80a9471f

22 Jan, 2023 1 commit

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

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"

d9f91dd4

21 Jan, 2023 1 commit
- Update kf5 version requirement to 5.102.0 · a59c3586
  Jonathan Esk-Riddell authored Jan 21, 2023
```
GIT_SILENT
```
  a59c3586
19 Jan, 2023 2 commits
- Update version number for 5.28.80 · b03110e6
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  b03110e6
- Update version number for 5.26.90 · d246214c
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  d246214c
18 Jan, 2023 1 commit

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

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"

b80f513e

16 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · d5d9cfa2
  Script Kiddy authored Jan 16, 2023
  
  d5d9cfa2
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3c70c7e2
  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"
```
  3c70c7e2
14 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 0690960e
  Script Kiddy authored Jan 14, 2023
  
  0690960e
- GIT_SILENT Sync po/docbooks with svn · 757a8fee
  Script Kiddy authored Jan 14, 2023
  
  757a8fee
13 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 1a6b948b
  Script Kiddy authored Jan 13, 2023
  
  1a6b948b
- SVN_SILENT made messages (.desktop file) - always resolve ours · d2398a28
  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"
```
  d2398a28
11 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · a6457ff2
  Script Kiddy authored Jan 11, 2023
  
  a6457ff2
07 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 784adb23
  Script Kiddy authored Jan 07, 2023
  
  784adb23
06 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 13dfff3b
  Script Kiddy authored Jan 06, 2023
  
  13dfff3b
04 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 3ae10742
  Script Kiddy authored Jan 04, 2023
  
  3ae10742
- GIT_SILENT made messages (after extraction) · 9cc19fba
  Script Kiddy authored Jan 04, 2023
  
  9cc19fba
03 Jan, 2023 2 commits
- Update version number for 5.26.5 · 996f1e3b
  Jonathan Esk-Riddell authored Jan 03, 2023
```
GIT_SILENT
```
  996f1e3b
- GIT_SILENT Sync po/docbooks with svn · 987dc2cf
  Script Kiddy authored Jan 03, 2023
  
  987dc2cf
01 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · bf1f0c15
  Script Kiddy authored Jan 01, 2023
  
  bf1f0c15
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5f7d58d6
  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"
```
  5f7d58d6
30 Dec, 2022 1 commit

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

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

6eb288b4

29 Dec, 2022 1 commit

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

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

7fdcd5b8

25 Dec, 2022 2 commits
- GIT_SILENT Sync po/docbooks with svn · 763d2138
  Script Kiddy authored Dec 25, 2022
  
  763d2138
- SVN_SILENT made messages (.desktop file) - always resolve ours · 390d990d
  Script Kiddy authored Dec 25, 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"
```
  390d990d
24 Dec, 2022 1 commit

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

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

f470cb73

23 Dec, 2022 4 commits
- Use ecm_set_disabled_deprecation_versions · 43e45db5
  Laurent Montel authored Dec 23, 2022
  
  43e45db5
- We depend against 5.98 · a0d99fbf
  Laurent Montel authored Dec 23, 2022
  
  a0d99fbf
- GIT_SILENT Sync po/docbooks with svn · ed52ef54
  Script Kiddy authored Dec 23, 2022
  
  ed52ef54
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5c5d7a59
  Script Kiddy authored Dec 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"
```
  5c5d7a59