Commits · master · Multimedia / K3b

16 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · ca523cc5
  Script Kiddy authored Sep 16, 2020
  
  ca523cc5
11 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · a9749f1d
  Script Kiddy authored Sep 11, 2020
  
  a9749f1d
08 Sep, 2020 1 commit
- Port away from KRandom · fbf7be12
  Albert Astals Cid authored Sep 08, 2020
  
  fbf7be12
04 Sep, 2020 1 commit

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

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

3ebd3463

31 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · a6a88a60
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit 34a3da12)
```
  a6a88a60
07 Aug, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 51888651
  Script Kiddy authored Aug 07, 2020
  
  51888651
05 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · c27aced6
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit f36a30a2)
```
  c27aced6
13 Jul, 2020 3 commits
- Fix -Wimplicit-fallthrough warnings · 62467132
  Alexander Volkov authored Jul 13, 2020
  
  62467132
- SVN_SILENT made messages (.desktop file) - always resolve ours · 967c3ac6
  Script Kiddy authored Jul 13, 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"
```
  967c3ac6
- GIT_SILENT made messages (after extraction) · 65ef9303
  Script Kiddy authored Jul 13, 2020
  
  65ef9303
12 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d7ec1774
  Script Kiddy authored Jul 12, 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"
```
  d7ec1774
- GIT_SILENT made messages (after extraction) · 47428a09
  Script Kiddy authored Jul 12, 2020
  
  47428a09
11 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.11.70. · 2099e147
  Albert Astals Cid authored Jul 11, 2020
  
  2099e147
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 398a30e6
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 81f5da29)
```
  398a30e6
20 Jun, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 51a4f662
  Script Kiddy authored Jun 20, 2020
  
  51a4f662
19 Jun, 2020 3 commits

Merge branch 'release/20.04' · 8f60ed91
Luca Beltrame authored Jun 19, 2020

8f60ed91

Fix CMake module search · 564e54e7

Luca Beltrame authored Jun 19, 2020

The local cmake modules should, in this case, be preferred compared to
the ones in ECM, or the build will not be probably configured,
causing includes not to be found, and thus ending up in failure.

564e54e7

Fix CMake module search · 20b0908b

Luca Beltrame authored Jun 19, 2020

The local cmake modules should, in this case, be preferred compared to
the ones in ECM, or the build will not be probably configured,
causing includes not to be found, and thus ending up in failure.

20b0908b

18 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c345a9b5
  Script Kiddy authored Jun 18, 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"
```
  c345a9b5
- GIT_SILENT made messages (after extraction) · 8b63528e
  Script Kiddy authored Jun 18, 2020
  
  8b63528e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1aad3401
  Script Kiddy authored Jun 18, 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"
```
  1aad3401
- GIT_SILENT made messages (after extraction) · de4389f0
  Script Kiddy authored Jun 18, 2020
  
  de4389f0
17 Jun, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e85c0aa8
  Script Kiddy authored Jun 17, 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"
```
  e85c0aa8
- GIT_SILENT made messages (after extraction) · 5979ca17
  Script Kiddy authored Jun 17, 2020
  
  5979ca17
- SVN_SILENT made messages (.desktop file) - always resolve ours · 743f8976
  Script Kiddy authored Jun 17, 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"
```
  743f8976
- GIT_SILENT made messages (after extraction) · 6a7d04ec
  Script Kiddy authored Jun 17, 2020
  
  6a7d04ec
08 Jun, 2020 3 commits
- GIT_SILENT Update Appstream for new release · d4e28c3c
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit a4bbd230)
```
  d4e28c3c
- GIT_SILENT Update Appstream for new release · a4bbd230
  Christoph Feck authored Jun 08, 2020
  
  a4bbd230
- GIT_SILENT Upgrade release service version to 20.04.2. · 414e115a
  Christoph Feck authored Jun 08, 2020
  
  414e115a
07 Jun, 2020 1 commit
- GIT_SILENT made messages (after extraction) · d38055f2
  Script Kiddy authored Jun 07, 2020
  
  d38055f2
31 May, 2020 2 commits

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

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

c022209e

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

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

b79e7ba4

20 May, 2020 1 commit
- GIT_SILENT: add K3b icon as repository logo · 16c487c7
  Yuri Chornoivan authored May 20, 2020
  
  16c487c7
17 May, 2020 1 commit
- GIT_SILENT: we don't use phabricator now · 335c44ac
  Laurent Montel authored May 17, 2020
  
  335c44ac
11 May, 2020 3 commits
- GIT_SILENT Update Appstream for new release · 10d4e56e
  Christoph Feck authored May 11, 2020
  
  10d4e56e
- GIT_SILENT Update Appstream for new release · 12f77d88
  Christoph Feck authored May 11, 2020
```
(cherry picked from commit 10d4e56e)
```
  12f77d88
- GIT_SILENT Upgrade release service version to 20.04.1. · 5507c18e
  Christoph Feck authored May 11, 2020
  
  5507c18e
19 Apr, 2020 2 commits
- Merge branch 'release/20.04' · 60bdf202
  Albert Astals Cid authored Apr 20, 2020
  
  60bdf202
- Fix k3b not finishing if started without splash screen · aa7df781
  Albert Astals Cid authored Apr 20, 2020
```
BUG: 419105
```
  aa7df781
15 Apr, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 7c7861d7
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit e30f6f1d)
```
  7c7861d7