Commits · 6cb10cd44dcfc1d10ebe4028567c9a60baaef971 · PIM / Akonadi Search

24 May, 2016 1 commit
- Add COPYING files · 6cb10cd4
  Laurent Montel authored May 24, 2016
  
  6cb10cd4
22 May, 2016 1 commit
- Use KF5_VERSION · 23f6736f
  Laurent Montel authored May 22, 2016
  
  23f6736f
20 May, 2016 1 commit
- -Wunused fixes · faffd54f
  Allen Winter authored May 20, 2016
  
  faffd54f
26 Apr, 2016 1 commit
- Simplify update version · 9849eb4c
  Laurent Montel authored Apr 26, 2016
  
  9849eb4c
20 Mar, 2016 1 commit
- Master is open · bc15c834
  Laurent Montel authored Mar 20, 2016
  
  bc15c834
19 Mar, 2016 1 commit
- initialize pointer · 815fcaa4
  Laurent Montel authored Mar 19, 2016
  
  815fcaa4
18 Mar, 2016 1 commit
- initiliaze variable · f6eb6406
  Laurent Montel authored Mar 18, 2016
  
  f6eb6406
15 Mar, 2016 1 commit

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

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

9294e774

13 Mar, 2016 2 commits
- Prepare 16.04 · bb4a8034
  Laurent Montel authored Mar 13, 2016
  
  bb4a8034
- increase version · 898a7594
  Laurent Montel authored Mar 13, 2016
  
  898a7594
04 Mar, 2016 1 commit

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

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

91f789d5

19 Feb, 2016 1 commit

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

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

1dbf77b3

16 Feb, 2016 1 commit
- Revert "Use same version variable format as other pim packages do." · 4973d8e1
  Armin K authored Feb 16, 2016
```
This reverts commit a00692d3.

Apparently, akonadi-search isn't just a library.
```
  4973d8e1
14 Feb, 2016 2 commits
- Use same version variable format as other pim packages do. · a00692d3
  Armin K authored Feb 14, 2016
  
  a00692d3
- SVN_SILENT made messages (.desktop file) - always resolve ours · b1d9e124
  Script Kiddy authored Feb 14, 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"
```
  b1d9e124
28 Jan, 2016 1 commit
- Let KDE*CompilerSettings change the policies in the project · 46c80f61
  Aleix Pol Gonzalez authored Jan 28, 2016
```
As suggested in ECM documentation.
```
  46c80f61
18 Jan, 2016 1 commit
- Remove KF5AkonadiServer dependency, it's all KF5Akonadi now · a12594cd
  Daniel Vrátil authored Jan 19, 2016
  
  a12594cd
16 Jan, 2016 1 commit
- increase version · 541dc7da
  Laurent Montel authored Jan 16, 2016
  
  541dc7da
14 Jan, 2016 1 commit

Fix building on Linux with clang/libc++ · 959e60c7

Armin K authored Jan 14, 2016

errno identifier is used in the code, which will cause
build to fail since no libc++ headers include errno.h
directly

959e60c7

12 Jan, 2016 1 commit

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

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

37ce2239

21 Dec, 2015 7 commits
- Rename it · 0665cc14
  Laurent Montel authored Dec 21, 2015
  
  0665cc14
- SVN_SILENT made messages (.desktop file) - always resolve ours · 06dfb57a
  Script Kiddy authored Dec 21, 2015
```
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"
```
  06dfb57a
- increase version · 29cdcce2
  Laurent Montel authored Dec 21, 2015
  
  29cdcce2
- Merge remote-tracking branch 'origin/Applications/15.12' · 92d7b603
  Laurent Montel authored Dec 21, 2015
  
  92d7b603
- Increase version · af6408a3
  Laurent Montel authored Dec 21, 2015
  
  af6408a3
- Search in correct directory. So completion works now · c17141c6
  Laurent Montel authored Dec 21, 2015
  
  c17141c6
- Fix path · 98eea461
  Laurent Montel authored Dec 21, 2015
  
  98eea461
17 Dec, 2015 1 commit

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

Script Kiddy authored Dec 17, 2015

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"

84850697

09 Dec, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 45a22e86
  Script Kiddy authored Dec 09, 2015
  
  45a22e86
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5c74d3da
  Script Kiddy authored Dec 09, 2015
```
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"
```
  5c74d3da
26 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 2806741c
  Script Kiddy authored Nov 26, 2015
  
  2806741c
- SVN_SILENT made messages (.desktop file) - always resolve ours · eb5f14ce
  Script Kiddy authored Nov 26, 2015
```
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"
```
  eb5f14ce
25 Nov, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 9f2f0a9f
  Script Kiddy authored Nov 25, 2015
  
  9f2f0a9f
21 Nov, 2015 2 commits
- Mark ctor explicit · fb1f8cc9
  Sergio Martins authored Nov 21, 2015
  
  fb1f8cc9
- Add missing Q_OBJECT · 25eab0ac
  Sergio Martins authored Nov 21, 2015
  
  25eab0ac
19 Nov, 2015 1 commit
- Don't use const'ref for int · d77d9ee2
  Laurent Montel authored Nov 19, 2015
  
  d77d9ee2
16 Nov, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 6a4bfd5f
  Script Kiddy authored Nov 16, 2015
  
  6a4bfd5f
15 Nov, 2015 2 commits
- Now 5.2 is open · 2624b7d3
  Laurent Montel authored Nov 15, 2015
  
  2624b7d3
- Prepare beta1 · 60da90e7
  Laurent Montel authored Nov 15, 2015
  
  60da90e7
11 Nov, 2015 1 commit

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

Script Kiddy authored Nov 11, 2015

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"

c487aa00