Commits · 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf · Graphics / Okular

13 Jul, 2021 1 commit
- Fix non unique KPlugin Id for fictionbook generator · 8dc58c76
  Yaroslav Sidlovsky authored Jul 12, 2021 and Albert Astals Cid committed Jul 13, 2021
```
BUG: 439807
```
  8dc58c76
11 Jul, 2021 1 commit

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

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

5447aa10

06 Jul, 2021 1 commit

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

Script Kiddy authored Jul 06, 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"

16da5cb4

21 May, 2021 1 commit

Clean up ServiceType property usage for JSON based plugins · 8b13d989

Alexander Lohnau authored May 20, 2021

This is no needed anymore, because the plugins are installed into a
specific dir. It is a leftover from the time where the ServiceTypes were
used to find the correct plugins.

Task: https://phabricator.kde.org/T14483

8b13d989

24 Jan, 2021 2 commits

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

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"

c637a7e1

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

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"

dd621979

20 Dec, 2020 1 commit

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

Script Kiddy authored Dec 20, 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"

f16b7670

26 Nov, 2020 1 commit

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

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

a61977aa

25 Nov, 2020 1 commit

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

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

c9440a91

17 Oct, 2020 1 commit

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

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

dc74ffa6

30 Jul, 2020 2 commits

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

Script Kiddy authored Jul 30, 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"

36a6010c

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

Script Kiddy authored Jul 30, 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"

8563aa45

18 Jun, 2020 2 commits

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

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"

7254c568

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

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"

90502b29

17 Jun, 2020 2 commits

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

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"

1f50b2a6

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

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"

2857dc24

28 Jan, 2020 1 commit

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

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

79de5d39

09 Sep, 2019 2 commits

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

Script Kiddy authored Sep 09, 2019

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"

86fba9df

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

Script Kiddy authored Sep 09, 2019

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"

7f978806

24 Oct, 2018 1 commit

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

Script Kiddy authored Oct 24, 2018

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"

33a5f67e

04 Aug, 2018 2 commits

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

Script Kiddy authored Aug 04, 2018

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"

d85fe1df

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

Script Kiddy authored Aug 04, 2018

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"

f1d3c681

07 Jul, 2018 2 commits

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

Script Kiddy authored Jul 07, 2018

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"

2e73a6d7

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

Script Kiddy authored Jul 07, 2018

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"

879a46ac

29 Jan, 2018 2 commits

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

Script Kiddy authored Jan 29, 2018

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"

9c6494b3

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

Script Kiddy authored Jan 29, 2018

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"

29b1dec9

01 Dec, 2017 1 commit

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

Script Kiddy authored Dec 01, 2017

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"

066805c5

28 Nov, 2017 1 commit

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

Script Kiddy authored Nov 28, 2017

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"

02a4cfb2

30 Jul, 2017 1 commit

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

Script Kiddy authored Jul 30, 2017

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"

36c60741

20 Jun, 2017 1 commit

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

Script Kiddy authored Jun 20, 2017

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"

451bb151

21 May, 2017 1 commit

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

Script Kiddy authored May 21, 2017

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"

bb8c12d1

12 May, 2017 1 commit

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

Script Kiddy authored May 12, 2017

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"

bfe1f62e

22 Apr, 2017 1 commit

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

Script Kiddy authored Apr 22, 2017

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"

94fbca1c

17 Apr, 2017 1 commit

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

Script Kiddy authored Apr 17, 2017

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"

91e740c2

09 Apr, 2017 2 commits

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

Script Kiddy authored Apr 09, 2017

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"

dc104a44

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

Script Kiddy authored Apr 09, 2017

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"

cce5cf25

26 Feb, 2017 1 commit

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

Script Kiddy authored Feb 26, 2017

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"

5b7a8d3d

07 Feb, 2017 1 commit

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

Script Kiddy authored Feb 07, 2017

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"

c55c44ed

06 Feb, 2017 2 commits

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

Script Kiddy authored Feb 06, 2017

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"

963ce79c

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

Script Kiddy authored Feb 06, 2017

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"

73816166