Commits · cad3c841e04add0416bd63227e0f096fbe9b3380 · Utilities / KFind

17 Jul, 2017 1 commit
- GIT_SILENT Upgrade KDE Applications version to 17.11.70. · cad3c841
  Albert Astals Cid authored Jul 17, 2017
  
  cad3c841
15 Jul, 2017 1 commit
- Merge remote-tracking branch 'origin/Applications/17.04' · 3c48e79a
  Luigi Toscano authored Jul 15, 2017
  
  3c48e79a
11 Jul, 2017 1 commit
- Fix duplicate code · a303beb2
  Laurent Montel authored Jul 11, 2017
  
  a303beb2
27 Jun, 2017 1 commit
- Remove some kdelibs4support class · a389382d
  Laurent Montel authored Jun 27, 2017
  
  a389382d
25 Jun, 2017 2 commits

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

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

a9730c7e

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

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

c5a7c42d

19 Jun, 2017 2 commits
- Port to QFileDialog · 468978b1
  Laurent Montel authored Jun 19, 2017
  
  468978b1
- Port to debug categories · b1b6501d
  Laurent Montel authored Jun 19, 2017
  
  b1b6501d
18 Jun, 2017 1 commit
- Minor · 92e2b220
  Laurent Montel authored Jun 18, 2017
  
  92e2b220
17 Jun, 2017 9 commits
- Increase minimum version · 6960b280
  Laurent Montel authored Jun 17, 2017
  
  6960b280
- Use explicit · f4828413
  Laurent Montel authored Jun 17, 2017
  
  f4828413
- Fix open regexpeditor · 09fbdaaa
  Laurent Montel authored Jun 17, 2017
  
  09fbdaaa
- Coding style · 4da778df
  Laurent Montel authored Jun 17, 2017
  
  4da778df
- Ignore files · 66fba87b
  Laurent Montel authored Jun 17, 2017
  
  66fba87b
- Fix clazy warning · 496cc35b
  Laurent Montel authored Jun 17, 2017
  
  496cc35b
- Fix indent · 087b1e4b
  Laurent Montel authored Jun 17, 2017
  
  087b1e4b
- Update copyright · 758cb9b4
  Laurent Montel authored Jun 17, 2017
  
  758cb9b4
- Use KDE_APPLICATIONS_VERSION · 50aec81c
  Laurent Montel authored Jun 17, 2017
  
  50aec81c
13 Jun, 2017 2 commits

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

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

3b9acdce

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

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

44084704

25 May, 2017 2 commits

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

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

a3fe7dfb

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

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

1a4bdd92

12 May, 2017 2 commits

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

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"

2ed02e28

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 1 commit

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