Commits · master · Multimedia / Dragon

21 Jan, 2021 1 commit

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

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

a43f8b41

14 Jan, 2021 1 commit

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

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

7666742f

08 Jan, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 3011c5b3
  Script Kiddy authored Jan 08, 2021
  
  3011c5b3
07 Jan, 2021 1 commit
- GIT_SILENT made messages (after extraction) · b30f79c7
  Script Kiddy authored Jan 07, 2021
  
  b30f79c7
05 Jan, 2021 1 commit

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

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

c7fb6066

04 Jan, 2021 1 commit

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

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

97a7269e

02 Jan, 2021 1 commit
- GIT_SILENT Update Appstream for new release · de630d31
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit ca5887cd)
```
  de630d31
05 Dec, 2020 2 commits
- Use .in suffix for header file that is passed to configure_file() · c7934b9c
  Friedrich W. H. Kossebau authored Dec 05, 2020
  
  c7934b9c
- Add .in suffix to desktop file that is passed to configure_file() · 42a7453f
  Friedrich W. H. Kossebau authored Dec 05, 2020
  
  42a7453f
02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 30a18df7
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit bfc16c53)
```
  30a18df7
30 Nov, 2020 1 commit
- Build with QT_NO_CAST_FROM_ASCII, missing one due to the version check · 31b6317d
  Johnny Jazeix authored Nov 30, 2020
  
  31b6317d
28 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 678d3f69
  Script Kiddy authored Nov 28, 2020
  
  678d3f69
27 Nov, 2020 3 commits
- Build with QT_NO_CAST_FROM_ASCII · 91a7a20f
  Friedrich W. H. Kossebau authored Nov 27, 2020
```
NO_CHANGELOG
```
  91a7a20f
- Use more member-function-pointer-based signal/slot connections · e9ae6ded
  Friedrich W. H. Kossebau authored Nov 27, 2020
```
NO_CHANGELOG
```
  e9ae6ded
- Port to new KPluginMetaData-based KParts API · a360c512
  Friedrich W. H. Kossebau authored Nov 27, 2020
```
NO_CHANGELOG
```
  a360c512
16 Nov, 2020 3 commits
- Revert accidental change of KAboutData with SPDX strings · 41d46235
  Friedrich W. H. Kossebau authored Nov 16, 2020
```
NO_CHANGELOG
```
  41d46235
- KF5DocTools is required, so no need to test if found · 781e8837
  Friedrich W. H. Kossebau authored Nov 16, 2020
```
NO_CHANGELOG
```
  781e8837
- Convert license statements to SPDX expressions · cd27a6e4
  Friedrich W. H. Kossebau authored Nov 16, 2020
```
Also add/move license files as required by REUSE specification
```
  cd27a6e4
08 Nov, 2020 1 commit
- GIT_SILENT Upgrade release service version to 21.03.70. · 8a6759c5
  Albert Astals Cid authored Nov 08, 2020
  
  8a6759c5
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 2a8389b3
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit a89550ad)
```
  2a8389b3
15 Oct, 2020 1 commit

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

Script Kiddy authored Oct 15, 2020

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"

15cbf314

08 Oct, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.08' · 4c40679f
  Heiko Becker authored Oct 08, 2020
  
  4c40679f
- Add kdoctools_install call previously added by release tools · a2b1c988
  Heiko Becker authored Oct 08, 2020
  
  a2b1c988
03 Oct, 2020 3 commits
- GIT_SILENT Update Appstream for new release · c51f6d7f
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit 4b157687)
```
  c51f6d7f
- GIT_SILENT Update Appstream for new release · 4b157687
  Christoph Feck authored Oct 03, 2020
  
  4b157687
- GIT_SILENT Upgrade release service version to 20.08.2. · 22d82b12
  Christoph Feck authored Oct 03, 2020
  
  22d82b12
10 Sep, 2020 4 commits
- Use Q_EMIT over emit · 97897b6b
  Friedrich W. H. Kossebau authored Sep 10, 2020
```
GIT_SILENT
```
  97897b6b
- Merge branch 'release/20.08' into master · 15d41302
  Friedrich W. H. Kossebau authored Sep 10, 2020
  
  15d41302
- Add explicit ki18n_install(po) call · a84e38ea
  Friedrich W. H. Kossebau authored Sep 10, 2020
```
GIT_SILENT
```
  a84e38ea
- GIT_SILENT made messages (after extraction) · fe883804
  Script Kiddy authored Sep 10, 2020
  
  fe883804
31 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · f4f44399
  Christoph Feck authored Aug 31, 2020
  
  f4f44399
- GIT_SILENT Update Appstream for new release · 074fb354
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit f4f44399)
```
  074fb354
- GIT_SILENT Upgrade release service version to 20.08.1. · 186476f2
  Christoph Feck authored Aug 31, 2020
  
  186476f2
05 Aug, 2020 3 commits
- GIT_SILENT Update Appstream for new release · 72f22806
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit 52343e9d)
```
  72f22806
- GIT_SILENT Update Appstream for new release · 52343e9d
  Christoph Feck authored Aug 05, 2020
  
  52343e9d
- GIT_SILENT Upgrade release service version to 20.08.0. · 5a7716fa
  Christoph Feck authored Aug 05, 2020
  
  5a7716fa
31 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.90. · 6a1fae46
  Christoph Feck authored Jul 31, 2020
  
  6a1fae46
21 Jul, 2020 3 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 080f094b
  Script Kiddy authored Jul 21, 2020
```
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"
```
  080f094b
- GIT_SILENT made messages (after extraction) · 68e55d3f
  Script Kiddy authored Jul 21, 2020
  
  68e55d3f
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3b9d8db6
  Script Kiddy authored Jul 21, 2020
```
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"
```
  3b9d8db6