Commits · 05974d35d8740ff88fd7a7a4f89a42a461999fa2 · Plasma / KWriteD

10 Mar, 2018 10 commits
- Remove unneeded remove_definitions · 05974d35
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  05974d35
- Call KAboutData::setApplicationData after QApp instance is created · a7684392
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  a7684392
- Remove no longer needed code variant for older Qt version · f64a6b1d
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  f64a6b1d
- Remove module prefix from Qt include · 44fa7a33
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  44fa7a33
- Use overide · ecd99a66
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  ecd99a66
- Use nullptr · 9e5ad9d0
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  9e5ad9d0
- Let KDECompilerSettings change the policies in the project · a58c9888
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  a58c9888
- Use KF5_MIN_VERSION also for ECM, now that it's part of KF · 8d381bd9
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  8d381bd9
- Require KDE Frameworks 5.42 and Qt 5.9 · 21992e38
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  21992e38
- Bump min cmake version to 3.0, move cmake_minimum_required to begin · 758411f2
  Friedrich W. H. Kossebau authored Mar 10, 2018
  
  758411f2
15 Jan, 2018 2 commits
- Update version number for 5.12.80 · d37d49cd
  Jonathan Esk-Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  d37d49cd
- Update version number for 5.11.95 · 318899b8
  Jonathan Esk-Riddell authored Jan 15, 2018
```
GIT_SILENT
```
  318899b8
05 Jan, 2018 1 commit
- Remove obsolete reviewboardrc file · 76b3190e
  Laurent Montel authored Jan 05, 2018
  
  76b3190e
14 Sep, 2017 1 commit
- Update version number for 5.11.90 · 9b1b7768
  Jonathan Esk-Riddell authored Sep 14, 2017
```
GIT_SILENT
```
  9b1b7768
13 Sep, 2017 1 commit
- Update version number for 5.10.95 · c41c78eb
  Jonathan Esk-Riddell authored Sep 13, 2017
```
GIT_SILENT
```
  c41c78eb
30 Aug, 2017 1 commit

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

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

f3115867

11 May, 2017 2 commits
- Update version number for 5.10.90 · a6de88a5
  Jonathan Esk-Riddell authored May 11, 2017
```
GIT_SILENT
```
  a6de88a5
- Update version number for 5.9.95 · 8961c219
  Jonathan Esk-Riddell authored May 11, 2017
```
GIT_SILENT
```
  8961c219
25 Apr, 2017 1 commit

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

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

87cc13b3

09 Apr, 2017 1 commit

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

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

bd916e18

20 Mar, 2017 2 commits
- Merge Plasma/5.9 · a90110c1
  Jonathan Esk-Riddell authored Mar 20, 2017
  
  a90110c1
- merge Plasma/5.8 · f871e69f
  Jonathan Esk-Riddell authored Mar 20, 2017
  
  f871e69f
17 Mar, 2017 2 commits

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

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

9bce250d

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

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

fea369b8

28 Feb, 2017 1 commit
- Update version number for 5.9.3 · e9dd3e2a
  Jonathan Esk-Riddell authored Feb 28, 2017
```
GIT_SILENT
```
  e9dd3e2a
21 Feb, 2017 1 commit
- Update version number for 5.8.6 · c4d29f5d
  Jonathan Esk-Riddell authored Feb 21, 2017
```
GIT_SILENT
```
  c4d29f5d
20 Feb, 2017 1 commit
- merge Plasma/5.9 · dfa0708b
  Jonathan Esk-Riddell authored Feb 20, 2017
  
  dfa0708b
14 Feb, 2017 2 commits
- Update version number for 5.9.2 · 7e9aa3d2
  Jonathan Esk-Riddell authored Feb 14, 2017
```
GIT_SILENT
```
  7e9aa3d2
- SVN_SILENT made messages (.desktop file) - always resolve ours · c519b11e
  Script Kiddy authored Feb 14, 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"
```
  c519b11e
07 Feb, 2017 3 commits
- Update version number for 5.9.1 · 4a944d47
  Jonathan Esk-Riddell authored Feb 07, 2017
```
GIT_SILENT
```
  4a944d47
- Merge Plasma/5.9 into master · dfbba232
  Jonathan Esk-Riddell authored Feb 07, 2017
  
  dfbba232
- Merge branch 'Plasma/5.8' into Plasma/5.9 · 3ddb225d
  Jonathan Esk-Riddell authored Feb 07, 2017
  
  3ddb225d
26 Jan, 2017 1 commit
- Update version number for 5.9.0 · 16c9b29b
  Jonathan Esk-Riddell authored Jan 26, 2017
```
GIT_SILENT
```
  16c9b29b
17 Jan, 2017 1 commit

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

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

128fa48d

12 Jan, 2017 2 commits
- Update version number for 5.9.90 · ba0ef861
  Jonathan Esk-Riddell authored Jan 12, 2017
```
GIT_SILENT
```
  ba0ef861
- Update version number for 5.8.95 · a53845b1
  Jonathan Esk-Riddell authored Jan 12, 2017
```
GIT_SILENT
```
  a53845b1
27 Dec, 2016 1 commit
- Update version number for 5.8.5 · 9d0b74ec
  Jonathan Esk-Riddell authored Dec 27, 2016
```
GIT_SILENT
```
  9d0b74ec
20 Dec, 2016 1 commit

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

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"

f7e7a7e0

15 Dec, 2016 1 commit

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

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

16079238

02 Dec, 2016 1 commit

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

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"

5d390cbf