Commits · v20.08.2 · Accessibility / KMag

04 Oct, 2020 1 commit

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

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

358da3a4

03 Oct, 2020 2 commits
- GIT_SILENT Update Appstream for new release · add04380
  Christoph Feck authored Oct 03, 2020
  
  add04380
- GIT_SILENT Upgrade release service version to 20.08.2. · 6c176cf7
  Christoph Feck authored Oct 03, 2020
  
  6c176cf7
31 Aug, 2020 2 commits
- GIT_SILENT Update Appstream for new release · 504c394c
  Christoph Feck authored Aug 31, 2020
  
  504c394c
- GIT_SILENT Upgrade release service version to 20.08.1. · cbb5191e
  Christoph Feck authored Aug 31, 2020
  
  cbb5191e
05 Aug, 2020 2 commits
- GIT_SILENT Update Appstream for new release · 1b9ebb0d
  Christoph Feck authored Aug 05, 2020
  
  1b9ebb0d
- GIT_SILENT Upgrade release service version to 20.08.0. · e9976d92
  Christoph Feck authored Aug 05, 2020
  
  e9976d92
31 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.90. · 3f477476
  Christoph Feck authored Jul 31, 2020
  
  3f477476
23 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 39b4e6c0
  Script Kiddy authored Jul 23, 2020
  
  39b4e6c0
11 Jul, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.07.80. · f9815a6a
  Albert Astals Cid authored Jul 11, 2020
  
  f9815a6a
- Change KDE_APPLICATIONS_VERSION to RELEASE_SERVICE_VERSION https://phabricator.kde.org/T11933 · f1b1886e
  Albert Astals Cid authored Jul 11, 2020
```
CCMAIL: jr@jriddell.org
GIT_SILENT
```
  f1b1886e
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 72831e4b
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 2f314a7b)
```
  72831e4b
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1f47ca5f
  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"
```
  1f47ca5f
- GIT_SILENT made messages (after extraction) · 25e34fb0
  Script Kiddy authored Jun 18, 2020
  
  25e34fb0
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a87fcdf0
  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"
```
  a87fcdf0
- GIT_SILENT made messages (after extraction) · 7601750a
  Script Kiddy authored Jun 17, 2020
  
  7601750a
08 Jun, 2020 1 commit
- GIT_SILENT Update Appstream for new release · cee32fc4
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit 0c73318f)
```
  cee32fc4
27 May, 2020 2 commits
- GIT_SILENT: add KMag icon as repository logo · ef14ae86
  Yuri Chornoivan authored May 27, 2020
  
  ef14ae86
- Fix clazy warning · 285bdd06
  Laurent Montel authored May 27, 2020
  
  285bdd06
11 May, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 3504ce6a
  Christoph Feck authored May 11, 2020
```
(cherry picked from commit 70fa2003)
```
  3504ce6a
15 Apr, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 5f183e63
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit c6bd688e)
```
  5f183e63
28 Mar, 2020 1 commit
- GIT_SILENT: ignore .cmake generated by qtc · 209dd5e7
  Laurent Montel authored Mar 28, 2020
  
  209dd5e7
27 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 588696e5
  Script Kiddy authored Mar 27, 2020
  
  588696e5
17 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.04' · 9ba59bfd
  Laurent Montel authored Mar 17, 2020
  
  9ba59bfd
- GIT_SILENT: Remove DISABLE_DEPRECATED_BEFORE macro. It can break compile when we increase KF5/Qt5 · e2142e85
  Laurent Montel authored Mar 17, 2020
  
  e2142e85
15 Mar, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.03.80. · bfccfaea
  Albert Astals Cid authored Mar 15, 2020
  
  bfccfaea
- GIT_SILENT Upgrade release service version to 20.07.70. · 54baa4ea
  Albert Astals Cid authored Mar 15, 2020
  
  54baa4ea
09 Mar, 2020 1 commit
- Merge remote-tracking branch 'origin/release/19.12' · 2354a166
  Albert Astals Cid authored Mar 10, 2020
  
  2354a166
06 Mar, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ef99b018
  Script Kiddy authored Mar 06, 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"
```
  ef99b018
- GIT_SILENT made messages (after extraction) · 51b606a1
  Script Kiddy authored Mar 06, 2020
  
  51b606a1
01 Mar, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 73afc3b4
  Christoph Feck authored Mar 01, 2020
  
  73afc3b4
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · 4cbde958
  Christoph Feck authored Feb 29, 2020
  
  4cbde958
23 Feb, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a67cafee
  Script Kiddy authored Feb 23, 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"
```
  a67cafee
- GIT_SILENT made messages (after extraction) · 804e0cd6
  Script Kiddy authored Feb 23, 2020
  
  804e0cd6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0b9a3485
  Script Kiddy authored Feb 23, 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"
```
  0b9a3485
- GIT_SILENT made messages (after extraction) · 0276653e
  Script Kiddy authored Feb 23, 2020
  
  0276653e
14 Feb, 2020 2 commits
- GIT_SILENT made messages (after extraction) · f83eb0e9
  Script Kiddy authored Feb 14, 2020
  
  f83eb0e9
- SVN_SILENT made messages (.desktop file) - always resolve ours · 48f7bf19
  Script Kiddy authored Feb 14, 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"
```
  48f7bf19
03 Feb, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 53b99b19
  Christoph Feck authored Feb 04, 2020
  
  53b99b19
02 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.2. · 30a7fa08
  Christoph Feck authored Feb 02, 2020
  
  30a7fa08