Commits · master · Plasma / KHotkeys

29 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 8241804d
  Script Kiddy authored Jan 29, 2023
  
  8241804d
- SVN_SILENT made messages (.desktop file) - always resolve ours · a7966527
  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"
```
  a7966527
27 Jan, 2023 1 commit
- Update version number for 5.27.80 · cbd90ed7
  Jonathan Esk-Riddell authored Jan 27, 2023
```
GIT_SILENT
```
  cbd90ed7
21 Jan, 2023 1 commit
- Update kf5 version requirement to 5.102.0 · 21637e27
  Jonathan Esk-Riddell authored Jan 21, 2023
```
GIT_SILENT
```
  21637e27
20 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 86445a0b
  Script Kiddy authored Jan 20, 2023
  
  86445a0b
- SVN_SILENT made messages (.desktop file) - always resolve ours · 7f0fc703
  Script Kiddy authored Jan 20, 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"
```
  7f0fc703
19 Jan, 2023 3 commits
- Update version number for 5.28.80 · 026bfa89
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  026bfa89
- Update version number for 5.26.90 · 3ab6d0b9
  Jonathan Esk-Riddell authored Jan 19, 2023
```
GIT_SILENT
```
  3ab6d0b9
- SVN_SILENT made messages (.desktop file) - always resolve ours · e484cace
  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"
```
  e484cace
17 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 9964ab04
  Script Kiddy authored Jan 17, 2023
  
  9964ab04
13 Jan, 2023 2 commits
- GIT_SILENT Sync po/docbooks with svn · 8e4255b2
  Script Kiddy authored Jan 13, 2023
  
  8e4255b2
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6921e9c4
  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"
```
  6921e9c4
10 Jan, 2023 1 commit

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

Script Kiddy authored Jan 10, 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"

ae80d578

07 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 3f8bae6d
  Script Kiddy authored Jan 07, 2023
  
  3f8bae6d
06 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · dd124cb9
  Script Kiddy authored Jan 06, 2023
  
  dd124cb9
04 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 7cfa55d8
  Script Kiddy authored Jan 04, 2023
  
  7cfa55d8
03 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 2452c5be
  Script Kiddy authored Jan 03, 2023
  
  2452c5be
02 Jan, 2023 1 commit
- GIT_SILENT Sync po/docbooks with svn · 950a3e5f
  Script Kiddy authored Jan 02, 2023
  
  950a3e5f
30 Dec, 2022 4 commits
- GIT_SILENT Sync po/docbooks with svn · edc99c19
  Script Kiddy authored Dec 30, 2022
  
  edc99c19
- SVN_SILENT made messages (.desktop file) - always resolve ours · 909aa12c
  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"
```
  909aa12c
- GIT_SILENT Sync po/docbooks with svn · f02dd250
  Script Kiddy authored Dec 30, 2022
  
  f02dd250
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0a903ee2
  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"
```
  0a903ee2
29 Dec, 2022 2 commits
- GIT_SILENT Sync po/docbooks with svn · 0fc8fac0
  Script Kiddy authored Dec 29, 2022
  
  0fc8fac0
- SVN_SILENT made messages (.desktop file) - always resolve ours · a0cf9cd0
  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"
```
  a0cf9cd0
28 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 4679f93f
  Script Kiddy authored Dec 28, 2022
  
  4679f93f
25 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 1a61e74f
  Script Kiddy authored Dec 25, 2022
  
  1a61e74f
18 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 998c0a52
  Script Kiddy authored Dec 18, 2022
  
  998c0a52
17 Dec, 2022 2 commits
- GIT_SILENT Sync po/docbooks with svn · 47192a07
  Script Kiddy authored Dec 17, 2022
  
  47192a07
- SVN_SILENT made messages (.desktop file) - always resolve ours · 9cb11ce2
  Script Kiddy authored Dec 17, 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"
```
  9cb11ce2
14 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 741bac3e
  Script Kiddy authored Dec 14, 2022
  
  741bac3e
02 Dec, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · bb898f90
  Script Kiddy authored Dec 02, 2022
  
  bb898f90
28 Nov, 2022 1 commit
- Fix typo in dependency name · 10ca6160
  Nicolas Fella authored Nov 28, 2022
  
  10ca6160
27 Nov, 2022 1 commit
- Install translated documentation from po/ too · 9fc92830
  Luigi Toscano authored Nov 27, 2022
  
  9fc92830
22 Nov, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 5ef685d1
  Script Kiddy authored Nov 22, 2022
  
  5ef685d1
20 Nov, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 58417016
  Script Kiddy authored Nov 20, 2022
  
  58417016
07 Nov, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · cc7dc02d
  Script Kiddy authored Nov 07, 2022
  
  cc7dc02d
02 Nov, 2022 1 commit

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

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

c021b368

31 Oct, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 1fe0e1dc
  Script Kiddy authored Oct 31, 2022
  
  1fe0e1dc
26 Oct, 2022 1 commit

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

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

da0741d7

22 Oct, 2022 1 commit
- GIT_SILENT Sync po/docbooks with svn · 018c15cb
  Script Kiddy authored Oct 22, 2022
  
  018c15cb