Commits · 62e22779da5efc6b002c18173016c1f3e7bdab59 · Games / Palapeli

03 Oct, 2021 1 commit
- Fix repo path for kdegames · 62e22779
  Nicolas Fella authored Oct 03, 2021
  
  62e22779
30 Sep, 2021 1 commit
- GIT_SILENT: add CI linux · 8cb26c88
  Laurent Montel authored Sep 30, 2021
  
  8cb26c88
07 Sep, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 32942100
  Script Kiddy authored Sep 07, 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"
```
  32942100
- GIT_SILENT made messages (after extraction) · bc20b15f
  Script Kiddy authored Sep 07, 2021
  
  bc20b15f
30 Aug, 2021 1 commit
- GIT_SILENT: we can use qOverload directly · c33f37dc
  Laurent Montel authored Aug 30, 2021
  
  c33f37dc
27 Aug, 2021 4 commits
- GIT_SILENT Update Appstream for new release · ee8a7410
  Heiko Becker authored Aug 27, 2021
```
(cherry picked from commit 45ee6ee1)
```
  ee8a7410
- Fix plugin loading · 772fc8cf
  Laurent Montel authored Aug 27, 2021
  
  772fc8cf
- Port to new plugin support · edfafd86
  Laurent Montel authored Aug 27, 2021
  
  edfafd86
- GIT_SILENT: now we can use sdt::as_const · 289786c0
  Laurent Montel authored Aug 27, 2021
  
  289786c0
04 Aug, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 4d18ee6c
  Heiko Becker authored Aug 05, 2021
```
(cherry picked from commit 751e8061)
```
  4d18ee6c
28 Jul, 2021 1 commit

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

Script Kiddy authored Jul 28, 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"

2df0f225

17 Jul, 2021 1 commit

Bump min KF version to 5.85 · d3f694bd

Friedrich W. H. Kossebau authored Jul 17, 2021

Also include KDE & ECM cmake modules before checking other deps,
for consistency and to ensure KDE settings are deployed before doing more.

GIT_SILENT

d3f694bd

10 Jul, 2021 1 commit
- GIT_SILENT Upgrade release service version to 21.11.70. · fd17215b
  Albert Astals Cid authored Jul 10, 2021
  
  fd17215b
05 Jul, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 8423eb31
  Heiko Becker authored Jul 05, 2021
```
(cherry picked from commit 3a67afdd)
```
  8423eb31
09 Jun, 2021 1 commit

Clean up ServiceType property usage for JSON based plugins · a39f151a

Alexander Lohnau authored Jun 09, 2021

This is no needed anymore, because the plugins are installed into a
specific dir. It is a leftover from the time where the ServiceTypes were
used to find the correct plugins.

Task: https://phabricator.kde.org/T14483

a39f151a

05 Jun, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 92597432
  Heiko Becker authored Jun 05, 2021
```
(cherry picked from commit 6e04b471)
```
  92597432
17 May, 2021 4 commits
- GIT_SILENT: add clazy + build support · 8c7b0b6f
  Laurent Montel authored May 17, 2021
  
  8c7b0b6f
- Drop code variant for no longer supported Qt versions · 2f20ae31
  Friedrich W. H. Kossebau authored May 17, 2021
```
GIT_SILENT
```
  2f20ae31
- Use more target-centric cmake code · 32280a6d
  Friedrich W. H. Kossebau authored May 17, 2021
```
GIT_SILENT
```
  32280a6d
- SVN_SILENT made messages (.desktop file) - always resolve ours · 27e3e756
  Script Kiddy authored May 17, 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"
```
  27e3e756
07 May, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 493f0c2a
  Heiko Becker authored May 07, 2021
```
(cherry picked from commit c3c17735)
```
  493f0c2a
06 May, 2021 1 commit
- GIT_SILENT Add auto generated files to .gitignore · 6651e7cc
  Alexander Lohnau authored May 06, 2021
  
  6651e7cc
24 Apr, 2021 2 commits
- Merge branch 'release/21.04' · 6ab19044
  Andreas Sturmlechner authored Apr 24, 2021
  
  6ab19044
- Drop bogus Qt5::Concurrent from target_link_libraries · 30ff07fd
  Andreas Sturmlechner authored Apr 24, 2021
```
BUG: 436132

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
```
  30ff07fd
14 Apr, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 6b4dc7cf
  Heiko Becker authored Apr 14, 2021
```
(cherry picked from commit 11470248)
```
  6b4dc7cf
- GIT_SILENT Update Appstream for new release · 11470248
  Heiko Becker authored Apr 14, 2021
  
  11470248
- GIT_SILENT Upgrade release service version to 21.04.0. · 3ddda127
  Heiko Becker authored Apr 14, 2021
  
  3ddda127
09 Apr, 2021 1 commit
- GIT_SILENT Upgrade release service version to 21.03.90. · e21bc82f
  Heiko Becker authored Apr 09, 2021
  
  e21bc82f
05 Apr, 2021 2 commits

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

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

52b444f6

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

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

1c4b1c7e

22 Mar, 2021 2 commits

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

Script Kiddy authored Mar 22, 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"

3fba0419

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

Script Kiddy authored Mar 22, 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"

e23ef857

13 Mar, 2021 2 commits
- GIT_SILENT Upgrade release service version to 21.07.70. · 17ec0b83
  Albert Astals Cid authored Mar 13, 2021
  
  17ec0b83
- GIT_SILENT Upgrade release service version to 21.03.80. · 1487d79c
  Albert Astals Cid authored Mar 13, 2021
  
  1487d79c
08 Mar, 2021 1 commit

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

Script Kiddy authored Mar 08, 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"

2dfe767d

01 Mar, 2021 1 commit

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

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

9ca1691a

24 Feb, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 92cd971c
  Heiko Becker authored Feb 25, 2021
```
(cherry picked from commit 71f0e79d)
```
  92cd971c
21 Feb, 2021 1 commit

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

Script Kiddy authored Feb 21, 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"

80b4e295

19 Feb, 2021 1 commit

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

Script Kiddy authored Feb 19, 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"

47801171

15 Feb, 2021 1 commit

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

Script Kiddy authored Feb 15, 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"

755d0ad5