Commits · fd85c7b3123e92684c88c10c7d3b42b69361b329 · PIM / KAddressBook

02 Aug, 2020 1 commit
- GIT_SILENT: Compile fine against 5.72 · fd85c7b3
  Laurent Montel authored Aug 02, 2020
  
  fd85c7b3
30 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 5b40d18d
  Script Kiddy authored Jul 30, 2020
  
  5b40d18d
29 Jul, 2020 2 commits
- GIT_SILENT: coding style · 655c6f87
  Laurent Montel authored Jul 29, 2020
  
  655c6f87
- GIT_SILENT made messages (after extraction) · c11d2634
  Script Kiddy authored Jul 29, 2020
  
  c11d2634
28 Jul, 2020 1 commit

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

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

ff528cf0

27 Jul, 2020 2 commits
- Define AKONADI_SEARCH_VERSION · fed63a5d
  Laurent Montel authored Jul 27, 2020
  
  fed63a5d
- GIT_SILENT: time to increase version · b7e173fa
  Laurent Montel authored Jul 27, 2020
  
  b7e173fa
23 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 520b1462
  Script Kiddy authored Jul 23, 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"
```
  520b1462
- GIT_SILENT made messages (after extraction) · 277c531a
  Script Kiddy authored Jul 23, 2020
  
  277c531a
20 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15.0 RC · 14f38f1f
  Laurent Montel authored Jul 20, 2020
  
  14f38f1f
13 Jul, 2020 3 commits
- GIT_SILENT: increase dependancy · 16dd28d5
  Laurent Montel authored Jul 13, 2020
  
  16dd28d5
- SVN_SILENT made messages (.desktop file) - always resolve ours · cff075b7
  Script Kiddy authored Jul 13, 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"
```
  cff075b7
- GIT_SILENT made messages (after extraction) · 9f623d4c
  Script Kiddy authored Jul 13, 2020
  
  9f623d4c
12 Jul, 2020 3 commits
- GIT_SILENT: branch is opened · d99b9133
  Laurent Montel authored Jul 12, 2020
  
  d99b9133
- SVN_SILENT made messages (.desktop file) - always resolve ours · cd74106f
  Script Kiddy authored Jul 12, 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"
```
  cd74106f
- GIT_SILENT made messages (after extraction) · 2cca9131
  Script Kiddy authored Jul 12, 2020
  
  2cca9131
10 Jul, 2020 1 commit
- GIT_SILENT: Prepare 5.15 beta1 · 88cd8c26
  Laurent Montel authored Jul 10, 2020
  
  88cd8c26
09 Jul, 2020 1 commit
- GIT_SILENT: now that kparts was fixed we can increase KF_DISABLE_DEPRECATED_BEFORE_AND_AT · 98488e03
  Laurent Montel authored Jul 09, 2020
  
  98488e03
08 Jul, 2020 2 commits
- Revert "GIT_SILENT: It compiles fine against kf5.72 without deprecated methods" · e40a61ab
  Laurent Montel authored Jul 08, 2020
```
kparts is broken I provided a patch for it not accepted yet
This reverts commit 9efa1760.
```
  e40a61ab
- GIT_SILENT: It compiles fine against kf5.72 without deprecated methods · 9efa1760
  Laurent Montel authored Jul 08, 2020
  
  9efa1760
07 Jul, 2020 1 commit
- GIT_SILENT: prepare 5.15 beta1 · fbbb16a1
  Laurent Montel authored Jul 07, 2020
  
  fbbb16a1
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 34c226e0
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 12585c1c)
```
  34c226e0
01 Jul, 2020 1 commit

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

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

b6b7d6b5

20 Jun, 2020 1 commit

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

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

210c5398

19 Jun, 2020 1 commit
- GIT_SILENT: use CMAKE_CXX_STANDARD_REQUIRED · 9d119fba
  Laurent Montel authored Jun 19, 2020
  
  9d119fba
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 996d531f
  Script Kiddy authored Jun 18, 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"
```
  996d531f
- GIT_SILENT made messages (after extraction) · b69cef11
  Script Kiddy authored Jun 18, 2020
  
  b69cef11
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f9a945e0
  Script Kiddy authored Jun 17, 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"
```
  f9a945e0
- GIT_SILENT made messages (after extraction) · 83786690
  Script Kiddy authored Jun 17, 2020
  
  83786690
14 Jun, 2020 2 commits
- GIT_SILENT: remove check about git · 160dc664
  Laurent Montel authored Jun 14, 2020
  
  160dc664
- GIT_SILENT: time to increase it · 31c8c8ef
  Laurent Montel authored Jun 14, 2020
  
  31c8c8ef
10 Jun, 2020 1 commit
- Fix clazy warning · c7d4ed52
  Laurent Montel authored Jun 10, 2020
  
  c7d4ed52
09 Jun, 2020 1 commit

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

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

a5efb6e1

08 Jun, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 532e592f
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit db0524c7)
```
  532e592f
07 Jun, 2020 2 commits
- Remove unused includes · 50e9a1d7
  Laurent Montel authored Jun 07, 2020
  
  50e9a1d7
- SVN_SILENT made messages (.desktop file) - always resolve ours · 32b88458
  Script Kiddy authored Jun 07, 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"
```
  32b88458
06 Jun, 2020 1 commit

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

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

feddad28

05 Jun, 2020 2 commits
- GIT_SILENT: add more clazy check. · 8160ee14
  Laurent Montel authored Jun 05, 2020
  
  8160ee14
- GIT_SILENT: add more clazy check · f38cc8f9
  Laurent Montel authored Jun 04, 2020
  
  f38cc8f9
04 Jun, 2020 1 commit

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

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

f0de8ad4