Commits · 53e993ab7d820f579c464937f2aa7d6ec9cfc9f2 · Utilities / KFind

29 Apr, 2020 1 commit
- Fix my name :) · 53e993ab
  Kai Uwe Broulik authored Apr 29, 2020
  
  53e993ab
15 Apr, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 8789c46a
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit 259aa3dc)
```
  8789c46a
07 Apr, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.04' · fbda0482
  Heiko Becker authored Apr 07, 2020
  
  fbda0482
- Fix build with Qt >= 5.15.0-beta3 · 1ac41b6b
  Heiko Becker authored Apr 07, 2020
```
46ebd11e6 in qtbase removed the (int, QString) overload again and
un-deprecated the int overload.
```
  1ac41b6b
28 Mar, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.03.90. · 74dfa477
  Christoph Feck authored Mar 28, 2020
  
  74dfa477
- GIT_SILENT: ignore .cmake generated by qtc · 46681cd0
  Laurent Montel authored Mar 28, 2020
  
  46681cd0
27 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 53b89179
  Script Kiddy authored Mar 27, 2020
  
  53b89179
22 Mar, 2020 2 commits

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

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

205a1f3f

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

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

9587901d

17 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.04' · 0b5b2170
  Laurent Montel authored Mar 17, 2020
  
  0b5b2170
- GIT_SILENT: Remove DISABLE_DEPRECATED_BEFORE macro. It can break compile when we increase KF5/Qt5 · 01a95571
  Laurent Montel authored Mar 17, 2020
  
  01a95571
15 Mar, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.03.80. · b846b3ee
  Albert Astals Cid authored Mar 15, 2020
  
  b846b3ee
- GIT_SILENT Upgrade release service version to 20.07.70. · 8ff401d8
  Albert Astals Cid authored Mar 15, 2020
  
  8ff401d8
09 Mar, 2020 1 commit
- Merge remote-tracking branch 'origin/release/19.12' · 4a907b4a
  Albert Astals Cid authored Mar 10, 2020
  
  4a907b4a
03 Mar, 2020 1 commit
- Make it compile against qt5.15. SkipEmptyParts is part of Qt::. · 7ae13f7c
  Laurent Montel authored Mar 03, 2020
  
  7ae13f7c
01 Mar, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 19d789d9
  Christoph Feck authored Mar 01, 2020
  
  19d789d9
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · 54c927a8
  Christoph Feck authored Feb 29, 2020
  
  54c927a8
14 Feb, 2020 1 commit
- Make it compile against last qt5.15 without deprecated method · b3d99646
  Laurent Montel authored Feb 14, 2020
  
  b3d99646
12 Feb, 2020 2 commits
- Fix compile it's a new api from qt5.15 · 1e7ac49d
  Laurent Montel authored Feb 12, 2020
  
  1e7ac49d
- Make it compile against qt5.15. Constructor is deprecated · 3cb2fc77
  Laurent Montel authored Feb 12, 2020
  
  3cb2fc77
04 Feb, 2020 5 commits
- GIT_SILENT manually merge release versions from release/19.12 branch, in... · e003a4e5
  Jonathan Riddell authored Feb 04, 2020
```
GIT_SILENT manually merge release versions from release/19.12 branch, in future this will be cherry picked along with the branch commit
```
  e003a4e5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 908dcefd
  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"
```
  908dcefd
- GIT_SILENT made messages (after extraction) · cfd998e4
  Script Kiddy authored Feb 04, 2020
  
  cfd998e4
- SVN_SILENT made messages (.desktop file) - always resolve ours · de6de361
  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"
```
  de6de361
- GIT_SILENT made messages (after extraction) · 91ecb12f
  Script Kiddy authored Feb 04, 2020
  
  91ecb12f
03 Feb, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 3e51bf01
  Christoph Feck authored Feb 04, 2020
  
  3e51bf01
02 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.2. · 75abe69c
  Christoph Feck authored Feb 02, 2020
  
  75abe69c
06 Jan, 2020 1 commit
- Update Appstream for new release · f11453f2
  Christoph Feck authored Jan 06, 2020
  
  f11453f2
05 Jan, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.1. · 01d411a4
  Christoph Feck authored Jan 05, 2020
  
  01d411a4
30 Dec, 2019 1 commit
- Make it compiles against qt5.15 (endl other other use Qt:: namespace now) · cb510224
  Laurent Montel authored Dec 30, 2019
  
  cb510224
20 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 80a644b4
  Script Kiddy authored Dec 20, 2019
  
  80a644b4
13 Dec, 2019 1 commit
- Q_DECL_OVERRIDE -> override · db9475d3
  Albert Astals Cid authored Dec 13, 2019
  
  db9475d3
11 Dec, 2019 1 commit
- GIT_SILENT: use camelcase header · 3be71095
  Laurent Montel authored Dec 11, 2019
  
  3be71095
10 Dec, 2019 1 commit
- Change KDE_APPLICATIONS_VERSION to RELEASE_SERVICE_VERSION https://phabricator.kde.org/T11933 · 0a648ed3
  Jonathan Riddell authored Dec 10, 2019
```
GIT_SILENT
```
  0a648ed3
09 Dec, 2019 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 79acd01e
  Script Kiddy authored Dec 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"
```
  79acd01e
- GIT_SILENT made messages (after extraction) · c2fd2cb5
  Script Kiddy authored Dec 09, 2019
  
  c2fd2cb5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4666ce1e
  Script Kiddy authored Dec 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"
```
  4666ce1e
- GIT_SILENT made messages (after extraction) · b8a0f3da
  Script Kiddy authored Dec 09, 2019
  
  b8a0f3da
05 Dec, 2019 2 commits
- Update Appstream for new release · d4bda8dc
  Christoph Feck authored Dec 05, 2019
  
  d4bda8dc
- GIT_SILENT Upgrade KDE Applications version to 19.12.0. · 64061b57
  Christoph Feck authored Dec 05, 2019
  
  64061b57