Commits · 82b2581b9f4861a4e51f99a099b6ac3e84423bf6 · Plasma / Plasma Workspace

08 Jun, 2022 1 commit
- [applets/devicenotifier] Rename main script file to main.qml · 82b2581b
  ivan tkachenko authored Jun 07, 2022
```
It makes it uniform with most other applets, and for some setups/editors
it makes it easier to locate this file.
```
  82b2581b
18 May, 2022 1 commit

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

Script Kiddy authored May 18, 2022

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"

ff817abc

15 May, 2022 1 commit

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

Script Kiddy authored May 15, 2022

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"

f363b0fe

27 Apr, 2022 1 commit

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

Script Kiddy authored Apr 27, 2022

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"

a09776c0

15 Apr, 2022 1 commit

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

Script Kiddy authored Apr 15, 2022

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"

100aa732

27 Mar, 2022 1 commit

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

Script Kiddy authored Mar 27, 2022

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"

460a6485

14 Mar, 2022 1 commit

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

Script Kiddy authored Mar 14, 2022

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"

1f3a932c

01 Mar, 2022 1 commit

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

Script Kiddy authored Mar 01, 2022

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"

a2989774

28 Feb, 2022 1 commit

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

Script Kiddy authored Feb 28, 2022

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"

a7588366

21 Feb, 2022 1 commit

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

Script Kiddy authored Feb 21, 2022

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"

4d532f08

05 Feb, 2022 1 commit

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

Script Kiddy authored Feb 05, 2022

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"

2141988c

23 Jan, 2022 1 commit

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

Script Kiddy authored Jan 23, 2022

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"

6721c2ec

14 Jan, 2022 1 commit

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

Script Kiddy authored Jan 14, 2022

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"

482dc8a0

12 Jan, 2022 1 commit

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

Script Kiddy authored Jan 12, 2022

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"

1c12775e

08 Jan, 2022 1 commit

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

Script Kiddy authored Jan 08, 2022

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"

0d0b7130

04 Jan, 2022 1 commit

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

Script Kiddy authored Jan 04, 2022

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"

5259ac39

02 Jan, 2022 1 commit

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

Script Kiddy authored Jan 02, 2022

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"

594b933a

29 Dec, 2021 1 commit

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

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

5a792e98

23 Dec, 2021 1 commit

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

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

7ebe49f9

22 Dec, 2021 1 commit

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

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

41e9c0e6

18 Dec, 2021 1 commit

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

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

b64be79d

15 Dec, 2021 1 commit

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

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

07e7431c

14 Dec, 2021 1 commit

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

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

c7689f53

13 Dec, 2021 1 commit

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

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

36cadc2c

12 Dec, 2021 1 commit

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

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

50a7069a

11 Dec, 2021 1 commit
- applets: Convert Desktop files to JSON · 8cfc87cd
  Alexander Lohnau authored Dec 10, 2021
```
Task: https://phabricator.kde.org/T14564
```
  8cfc87cd