Commits · master · Graphics / KImageMap Editor

14 Jan, 2021 1 commit

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

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"

550e0cae

05 Jan, 2021 1 commit

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

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"

e9206550

04 Jan, 2021 1 commit

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

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"

fbbf225e

02 Jan, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 1e8d3b32
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit 64f91224)
```
  1e8d3b32
26 Dec, 2020 1 commit
- Port away from deprecated KSelectAction::triggered(int) · 43534636
  Friedrich W. H. Kossebau authored Dec 26, 2020
```
GIT_SILENT
```
  43534636
13 Dec, 2020 5 commits
- Port to new KPluginMetaData-based KParts API · 9508f6b0
  Friedrich W. H. Kossebau authored Dec 13, 2020
  
  9508f6b0
- Make shell use the KPart again instead via the plugin · 2a3f7758
  Friedrich W. H. Kossebau authored Dec 13, 2020
  
  2a3f7758
- Install kpart into kf5/parts subdir, adding JSON metadata · fb49986e
  Friedrich W. H. Kossebau authored Dec 13, 2020
  
  fb49986e
- Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH · 0bd8bae8
  Friedrich W. H. Kossebau authored Dec 13, 2020
  
  0bd8bae8
- Use more nullptr · cc5c836e
  Friedrich W. H. Kossebau authored Dec 13, 2020
  
  cc5c836e
02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · e8d4a41f
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit fcbba890)
```
  e8d4a41f
08 Nov, 2020 1 commit
- GIT_SILENT Upgrade release service version to 21.03.70. · 83a2965c
  Albert Astals Cid authored Nov 08, 2020
  
  83a2965c
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · f0e81f9e
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit 01e719ba)
```
  f0e81f9e
03 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 70ab8ed1
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit 35d6ec7a)
```
  70ab8ed1
31 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 76e98fe9
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit d0a5b740)
```
  76e98fe9
09 Aug, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6e950617
  Script Kiddy authored Aug 09, 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"
```
  6e950617
- GIT_SILENT made messages (after extraction) · f93d5ede
  Script Kiddy authored Aug 09, 2020
  
  f93d5ede
05 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · e2891234
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit d8a480ef)
```
  e2891234
21 Jul, 2020 1 commit

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

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"

01e2bb37

11 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.11.70. · 1ef4a508
  Albert Astals Cid authored Jul 11, 2020
  
  1ef4a508
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 9556e5dc
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 7521cc49)
```
  9556e5dc
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e295f438
  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"
```
  e295f438
- GIT_SILENT made messages (after extraction) · 7596b44c
  Script Kiddy authored Jun 18, 2020
  
  7596b44c
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a0727c8c
  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"
```
  a0727c8c
- GIT_SILENT made messages (after extraction) · 2a8de82b
  Script Kiddy authored Jun 17, 2020
  
  2a8de82b
08 Jun, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 8bbaf9fe
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit 9fc4bdd6)
```
  8bbaf9fe
20 May, 2020 1 commit
- GIT_SILENT: add KImagemapEditor icon as repository logo · c6ca0cbc
  Yuri Chornoivan authored May 20, 2020
  
  c6ca0cbc
11 May, 2020 1 commit
- GIT_SILENT Update Appstream for new release · bd011e0d
  Christoph Feck authored May 11, 2020
```
(cherry picked from commit c92fd158)
```
  bd011e0d
15 Apr, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 85fbd273
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit ab41b993)
```
  85fbd273
27 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 06f5acb5
  Script Kiddy authored Mar 27, 2020
  
  06f5acb5
15 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.07.70. · 31bdd45f
  Albert Astals Cid authored Mar 15, 2020
  
  31bdd45f
02 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · b160a4c5
  Script Kiddy authored Mar 02, 2020
  
  b160a4c5
01 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/release/19.12' · 94d8767e
  Pino Toscano authored Mar 01, 2020
  
  94d8767e
- appdata: use https for help URL · e1064354
  Pino Toscano authored Mar 01, 2020
  
  e1064354
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · 746d0e45
  Christoph Feck authored Feb 29, 2020
  
  746d0e45
04 Feb, 2020 1 commit

GIT_SILENT manually merge release versions from release/19.12 branch, in... · 513221e6

Jonathan Riddell authored Feb 04, 2020

GIT_SILENT manually merge release versions from release/19.12 branch, in future this will be cherry picked along with the branch commit

513221e6

03 Feb, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 3c6f2861
  Christoph Feck authored Feb 04, 2020
  
  3c6f2861
02 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.2. · be3f0a82
  Christoph Feck authored Feb 02, 2020
  
  be3f0a82
12 Jan, 2020 1 commit
- It alreadys added by kaboutdata · 40dcf63e
  Laurent Montel authored Jan 12, 2020
  
  40dcf63e
06 Jan, 2020 1 commit
- Update Appstream for new release · c01ec4a2
  Christoph Feck authored Jan 06, 2020
  
  c01ec4a2