Commits · master · Network / Krfb

13 Mar, 2021 3 commits
- GIT_SILENT Upgrade release service version to 21.07.70. · 730e4d74
  Albert Astals Cid authored Mar 13, 2021
  
  730e4d74
- SVN_SILENT made messages (.desktop file) - always resolve ours · d533b76f
  Script Kiddy authored Mar 13, 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"
```
  d533b76f
- GIT_SILENT made messages (after extraction) · 34a0e0c3
  Script Kiddy authored Mar 13, 2021
  
  34a0e0c3
12 Mar, 2021 1 commit
- Merge remote-tracking branch 'origin/release/20.12' · e1fdba30
  Albert Astals Cid authored Mar 13, 2021
  
  e1fdba30
24 Feb, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 73500f83
  Heiko Becker authored Feb 25, 2021
```
(cherry picked from commit f9a062ff)
```
  73500f83
- GIT_SILENT Update Appstream for new release · f9a062ff
  Heiko Becker authored Feb 25, 2021
  
  f9a062ff
- GIT_SILENT Upgrade release service version to 20.12.3. · a4177eac
  Heiko Becker authored Feb 25, 2021
  
  a4177eac
08 Feb, 2021 2 commits
- We depend against kf5.68 => depend against qt 5.12 · 15068b25
  Laurent Montel authored Feb 08, 2021
  
  15068b25
- GIT_SILENT: don't use deprecated cmake variable · 326d58a4
  Laurent Montel authored Feb 08, 2021
  
  326d58a4
29 Jan, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 1a7f3a85
  Heiko Becker authored Jan 29, 2021
  
  1a7f3a85
- GIT_SILENT Update Appstream for new release · 3625b0ce
  Heiko Becker authored Jan 29, 2021
```
(cherry picked from commit 1a7f3a85)
```
  3625b0ce
- GIT_SILENT Upgrade release service version to 20.12.2. · 7ef0dce3
  Heiko Becker authored Jan 29, 2021
  
  7ef0dce3
24 Jan, 2021 2 commits

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

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

72270006

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

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

938f98ce

22 Jan, 2021 2 commits
- Merge branch 'release/20.12' · 93eb2d78
  Aleix Pol Gonzalez authored Jan 22, 2021
  
  93eb2d78
- pipewire: Support BGRA · f041cdf0
  Aleix Pol Gonzalez authored Nov 26, 2020
```
It's not supported by QImage, so we need to do it ourselves by swapping
the B and the R.
```
  f041cdf0
18 Jan, 2021 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e1e359fa
  Script Kiddy authored Jan 18, 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"
```
  e1e359fa
- GIT_SILENT made messages (after extraction) · 50b72f26
  Script Kiddy authored Jan 18, 2021
  
  50b72f26
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2c184a22
  Script Kiddy authored Jan 18, 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"
```
  2c184a22
- GIT_SILENT made messages (after extraction) · bb35068a
  Script Kiddy authored Jan 18, 2021
  
  bb35068a
02 Jan, 2021 3 commits
- GIT_SILENT Update Appstream for new release · 706d4853
  Christoph Feck authored Jan 02, 2021
  
  706d4853
- GIT_SILENT Update Appstream for new release · f03b8298
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit 706d4853)
```
  f03b8298
- GIT_SILENT Upgrade release service version to 20.12.1. · 4335f83d
  Christoph Feck authored Jan 02, 2021
  
  4335f83d
18 Dec, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 08d967af
  Script Kiddy authored Dec 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"
```
  08d967af
- GIT_SILENT made messages (after extraction) · f0c1bc78
  Script Kiddy authored Dec 18, 2020
  
  f0c1bc78
07 Dec, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 230040c5
  Script Kiddy authored Dec 07, 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"
```
  230040c5
- GIT_SILENT made messages (after extraction) · dad7f018
  Script Kiddy authored Dec 07, 2020
  
  dad7f018
- SVN_SILENT made messages (.desktop file) - always resolve ours · 74070d3b
  Script Kiddy authored Dec 07, 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"
```
  74070d3b
- GIT_SILENT made messages (after extraction) · cceab8c1
  Script Kiddy authored Dec 07, 2020
  
  cceab8c1
02 Dec, 2020 3 commits
- GIT_SILENT Update Appstream for new release · b5a328b9
  Christoph Feck authored Dec 02, 2020
  
  b5a328b9
- GIT_SILENT Update Appstream for new release · 513b717f
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit b5a328b9)
```
  513b717f
- GIT_SILENT Upgrade release service version to 20.12.0. · a5f30095
  Christoph Feck authored Dec 02, 2020
  
  a5f30095
25 Nov, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.11.90. · 2b1f48b9
  Christoph Feck authored Nov 25, 2020
  
  2b1f48b9
18 Nov, 2020 2 commits

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

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

617f237d

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

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

dcc1bb2d

12 Nov, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 14aa98cc
  Script Kiddy authored Nov 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"
```
  14aa98cc
- GIT_SILENT made messages (after extraction) · 717607b1
  Script Kiddy authored Nov 12, 2020
  
  717607b1
11 Nov, 2020 1 commit

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

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

4e0aa9c7

08 Nov, 2020 2 commits
- GIT_SILENT Upgrade release service version to 21.03.70. · e34043d5
  Albert Astals Cid authored Nov 08, 2020
  
  e34043d5
- GIT_SILENT Upgrade release service version to 20.11.80. · 8010c34b
  Albert Astals Cid authored Nov 08, 2020
  
  8010c34b