Commits · 5b2994c7d7ce9e9c63275b3c2359d78d9a438889 · Utilities / KFind

12 May, 2017 1 commit

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

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"

5b2994c7

11 May, 2017 1 commit

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

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

5769bb0a

15 Mar, 2017 1 commit

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

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

78beb475

23 Feb, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 04f6b0bf
  Script Kiddy authored Feb 23, 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"
```
  04f6b0bf
- GIT_SILENT made messages (after extraction) · 0908fe03
  Script Kiddy authored Feb 23, 2017
  
  0908fe03
20 Feb, 2017 1 commit

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

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

9379559f

13 Feb, 2017 1 commit

Trim matching lines · 53512db9

Kai Uwe Broulik authored Feb 13, 2017

Otherwise you can end up with results in the form of "42: <many spaces> foo"

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

53512db9

07 Feb, 2017 1 commit

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

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"

1e1958dc

06 Feb, 2017 1 commit

Port to KDateComboBox of KWidgetsAddons · 76458d22

Kai Uwe Broulik authored Feb 06, 2017

KDateCombo still uses KLocale and blocks waiting for a DBus reply of ktimezoned which never arrives.
This class is now available in modernized form in KWidgetsAddons, so drop our own outdated copy.

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

76458d22

04 Feb, 2017 1 commit

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

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

2fdf7d51

30 Jan, 2017 1 commit

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

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

959d7198

23 Jan, 2017 2 commits

Proofread/update kfind docbooks · a25e9d7f

Burkhard Lück authored Jan 23, 2017

handbook: remove ENTITY kappname, not used in kf5
man page:
remove colon separated path, does not work since at least kde 3.5
add kf5options + qt5options to refsect1 'See Also'

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

a25e9d7f

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

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

5d0377be

16 Jan, 2017 1 commit

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

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

a9b93f57

09 Jan, 2017 1 commit

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

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

c93a28a6

08 Jan, 2017 1 commit

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

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

879e6d7e

06 Jan, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 781b2054
  Script Kiddy authored Jan 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"
```
  781b2054
- GIT_SILENT made messages (after extraction) · eb568c58
  Script Kiddy authored Jan 06, 2017
  
  eb568c58
03 Jan, 2017 1 commit

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

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

f78480dc

29 Dec, 2016 1 commit

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

Script Kiddy authored Dec 29, 2016

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"

a03b4e5d

27 Dec, 2016 1 commit

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

Script Kiddy authored Dec 27, 2016

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"

11b68c39

26 Dec, 2016 1 commit

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

Script Kiddy authored Dec 26, 2016

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"

c74e828d

25 Dec, 2016 1 commit

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

Script Kiddy authored Dec 25, 2016

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"

f7554b20

24 Dec, 2016 1 commit

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

Script Kiddy authored Dec 24, 2016

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"

613a3cb6

23 Dec, 2016 1 commit

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

Script Kiddy authored Dec 23, 2016

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"

4be34956

22 Dec, 2016 1 commit
- fix category and name in .desktop file · 2575ac33
  Jonathan Esk-Riddell authored Dec 22, 2016
```
REVIEW:129693
```
  2575ac33
20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

f0607ac2

15 Dec, 2016 2 commits
- add fdl · 33e217bc
  Jonathan Esk-Riddell authored Dec 15, 2016
  
  33e217bc
- add missing licence text · 8730a227
  Jonathan Esk-Riddell authored Dec 15, 2016
  
  8730a227
02 Dec, 2016 1 commit

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

Script Kiddy authored Dec 02, 2016

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"

3de26d07

23 Nov, 2016 1 commit

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

Script Kiddy authored Nov 23, 2016

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"

1f21c229

07 Nov, 2016 1 commit

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

Script Kiddy authored Nov 07, 2016

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"

c9ed37b2

06 Nov, 2016 1 commit

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

Script Kiddy authored Nov 06, 2016

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"

91c5c243

05 Nov, 2016 3 commits
- Reorganize kfind sources after move to own repo · af2bf528
  David Faure authored Nov 05, 2016
  
  af2bf528
- Add Q_DECL_OVERRIDE where appropriate (thanks to gcc's -Wsuggest-override) · 8cb82291
  David Faure authored Nov 01, 2016
  
  8cb82291
- Update maintainer information after discussing with Kai-Uwe ;) · 8a4a4a16
  David Faure authored Oct 23, 2016
```
Removed redundant AUTHORS file, the aboutdata in main.cpp has the list already.

CCMAIL: kde@privat.broulik.de
```
  8a4a4a16
19 Oct, 2016 1 commit
- SVN_SILENT made messages (after extraction) · a64394d8
  Script Kiddy authored Oct 19, 2016
  
  a64394d8
05 Oct, 2016 1 commit
- SVN_SILENT made messages (after extraction) · d460ac89
  Script Kiddy authored Oct 05, 2016
  
  d460ac89
02 Oct, 2016 2 commits
- kfind: add missing include for KIO_VERSION · 0ab4c707
  David Faure authored Oct 02, 2016
  
  0ab4c707
- KFind: use KIO 5.27's new addPluginActionsTo method. · f0aca251
  David Faure authored Oct 02, 2016
  
  f0aca251