Commits · 4a2ceae945826a439fb945486d4747529ad0b101 · Games / Killbots

20 Jun, 2022 1 commit
- Add Qt6 CI support · 4a2ceae9
  Laurent Montel authored Jun 20, 2022
  
  4a2ceae9
18 Jun, 2022 1 commit
- Remove build dep check for unused QtQuickWidgets · eb181b1e
  Friedrich W. H. Kossebau authored Jun 18, 2022
```
GIT_SILENT
```
  eb181b1e
16 Jun, 2022 1 commit

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

Script Kiddy authored Jun 16, 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"

31dea293

15 Jun, 2022 1 commit

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

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

58c477be

14 Jun, 2022 1 commit
- Port away from deprecated KgThemeProvider::discoverThemes() overload · ec9493cf
  Friedrich W. H. Kossebau authored Jun 15, 2022
```
GIT_SILENT
```
  ec9493cf
13 Jun, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 07a1ce7a
  Script Kiddy authored Jun 13, 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"
```
  07a1ce7a
- GIT_SILENT made messages (after extraction) · 6c925989
  Script Kiddy authored Jun 13, 2022
  
  6c925989
04 Jun, 2022 1 commit
- GIT_SILENT Update Appstream for new release · bdde38e5
  Heiko Becker authored Jun 04, 2022
```
(cherry picked from commit 238aee71)
```
  bdde38e5
01 Jun, 2022 1 commit

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

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

a67b1c7c

28 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c0cb3179
  Script Kiddy authored May 28, 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"
```
  c0cb3179
- GIT_SILENT made messages (after extraction) · 7f4b1f71
  Script Kiddy authored May 28, 2022
  
  7f4b1f71
15 May, 2022 1 commit

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

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

04236a4b

07 May, 2022 1 commit
- GIT_SILENT Update Appstream for new release · ed0bafc9
  Heiko Becker authored May 07, 2022
```
(cherry picked from commit 1f51860d)
```
  ed0bafc9
02 May, 2022 1 commit
- GIT_SILENT: Add test CI support · b229ce4d
  Laurent Montel authored May 02, 2022
  
  b229ce4d
01 May, 2022 1 commit

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

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

aee436af

12 Apr, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 830641f8
  Heiko Becker authored Apr 12, 2022
```
(cherry picked from commit cbca2331)
```
  830641f8
10 Apr, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 071ffc69
  Script Kiddy authored Apr 10, 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"
```
  071ffc69
- GIT_SILENT made messages (after extraction) · 96fa6860
  Script Kiddy authored Apr 10, 2022
  
  96fa6860
08 Apr, 2022 1 commit
- GIT_SILENT: Add window CI support · e1e107a2
  Laurent Montel authored Apr 08, 2022
  
  e1e107a2
30 Mar, 2022 1 commit

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

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

a88a61c9

23 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · c7689e91
  Script Kiddy authored Mar 23, 2022
  
  c7689e91
20 Mar, 2022 6 commits
- Merge branch 'release/22.04' · e2444ebf
  Nicolas Fella authored Mar 20, 2022
  
  e2444ebf
- Add missing KCoreAddons link · 307cf5a1
  Nicolas Fella authored Mar 20, 2022
  
  307cf5a1
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2450afec
  Script Kiddy authored Mar 20, 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"
```
  2450afec
- GIT_SILENT made messages (after extraction) · 6c70bd24
  Script Kiddy authored Mar 20, 2022
  
  6c70bd24
- SVN_SILENT made messages (.desktop file) - always resolve ours · eac6e754
  Script Kiddy authored Mar 20, 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"
```
  eac6e754
- GIT_SILENT made messages (after extraction) · 1070fc23
  Script Kiddy authored Mar 20, 2022
  
  1070fc23
12 Mar, 2022 2 commits
- GIT_SILENT Upgrade release service version to 22.07.70. · ab1d772c
  Albert Astals Cid authored Mar 12, 2022
  
  ab1d772c
- GIT_SILENT Upgrade release service version to 22.03.80. · cafe45bb
  Albert Astals Cid authored Mar 12, 2022
  
  cafe45bb
02 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 3291c8c5
  Script Kiddy authored Mar 02, 2022
  
  3291c8c5
27 Feb, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 111d2bdb
  Heiko Becker authored Feb 27, 2022
```
(cherry picked from commit a10481fa)
```
  111d2bdb
08 Feb, 2022 1 commit

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

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

bf519399

31 Jan, 2022 1 commit
- Revert · 21310c0b
  Laurent Montel authored Jan 31, 2022
  
  21310c0b
28 Jan, 2022 1 commit
- GIT_SILENT Update Appstream for new release · 530eb15d
  Heiko Becker authored Jan 29, 2022
```
(cherry picked from commit 01955b97)
```
  530eb15d
21 Jan, 2022 1 commit
- GIT_SILENT: add qt6 CI support · a395f223
  Laurent Montel authored Jan 21, 2022
  
  a395f223
05 Jan, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · bb9aa2c1
  Script Kiddy authored Jan 05, 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"
```
  bb9aa2c1
- GIT_SILENT made messages (after extraction) · 06c2f1ed
  Script Kiddy authored Jan 05, 2022
  
  06c2f1ed
03 Jan, 2022 1 commit
- GIT_SILENT Update Appstream for new release · da6b9dd7
  Heiko Becker authored Jan 03, 2022
```
(cherry picked from commit 076d5398)
```
  da6b9dd7
28 Dec, 2021 2 commits
- Adapt build system for building against qt6 · 70362196
  Laurent Montel authored Dec 28, 2021
  
  70362196
- Migration code will be removed in qt6 + AA_UseHighDpiPixmaps is enabled by default in qt6 · 79666f5c
  Laurent Montel authored Dec 28, 2021
  
  79666f5c