Commits · 94574f97c6745d939ad1eb0b8a5b1188563be293 · Libraries / Baloo Widgets

01 Apr, 2020 1 commit

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

Script Kiddy authored Apr 01, 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"

94574f97

19 Feb, 2020 1 commit

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

Script Kiddy authored Feb 19, 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"

089e245c

04 Feb, 2020 1 commit

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

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

36c09b22

05 Jan, 2020 1 commit

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

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

ed8a7a56

16 Dec, 2019 1 commit

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

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

15663f68

09 Nov, 2019 1 commit

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

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

08373185

31 Jul, 2019 2 commits

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

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

47048b71

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

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

c88f03ea

05 Jul, 2019 1 commit

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

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

36c29550

22 May, 2019 1 commit

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

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

8aea8d99

20 Jan, 2019 1 commit

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

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

798a0b03

14 Jan, 2019 1 commit

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

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

802b28dd

05 Jan, 2019 1 commit

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

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

d0740eeb

18 Nov, 2018 1 commit

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

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

faa0e0f1

20 Sep, 2018 1 commit

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

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

cdd23bee

15 Aug, 2018 1 commit

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

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

68ff89b5

27 Jul, 2018 1 commit

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

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

f77fdde5

22 Jul, 2018 1 commit

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

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

59699557

19 Jul, 2018 1 commit

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

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

466cda21

01 Jul, 2018 1 commit

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

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

55b0dadf

05 Jun, 2018 1 commit

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

Script Kiddy authored Jun 05, 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"

81b92bdd

20 Apr, 2018 1 commit

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

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

8c695d14

04 Apr, 2018 1 commit

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

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

d94852b4

05 Mar, 2018 1 commit

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

Script Kiddy authored Mar 05, 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"

112bee9a

19 Feb, 2018 1 commit

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

Script Kiddy authored Feb 19, 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"

ef8e7ad2

12 Feb, 2018 1 commit

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

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

d1271b35

08 Feb, 2018 1 commit

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

Script Kiddy authored Feb 08, 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"

11df1823

29 Jan, 2018 1 commit

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

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"

059d2ce9

23 Jan, 2018 1 commit

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

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

1963185b

22 Jan, 2018 1 commit

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

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

6723851c

19 Jan, 2018 1 commit

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

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

2767bc6d

17 Jan, 2018 1 commit

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

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

f58eb12a

15 Jan, 2018 1 commit

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

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

046f8771

14 Jan, 2018 1 commit

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

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

8faf65f4

13 Jan, 2018 1 commit

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

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

bdf40178

11 Jan, 2018 1 commit

[Baloo Widgets] Add KPropertiesDialog Plugin with file metadata · 832aa1b7

Kai Uwe Broulik authored Jan 11, 2018

This allows to view metadata (such as image dimensions, audio file album and artist information, etc) from the properties dialog.
Through this, tagging and rating functionality is also somewhat more accessible.

FEATURE: 384194

Differential Revision: https://phabricator.kde.org/D4614

832aa1b7