Commits · 86e451d92044affe1f1cdcd3d04f106efe300514 · PIM / libkdepim

26 Apr, 2016 1 commit
- Simplify update version · 86e451d9
  Laurent Montel authored Apr 26, 2016
  
  86e451d9
15 Apr, 2016 1 commit
- Fix warning · 5947b4d6
  Laurent Montel authored Apr 15, 2016
  
  5947b4d6
09 Apr, 2016 1 commit

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

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

37122e14

06 Apr, 2016 1 commit
- Add default value · efd26afe
  Laurent Montel authored Apr 06, 2016
  
  efd26afe
20 Mar, 2016 1 commit
- master is open · 30f45925
  Laurent Montel authored Mar 20, 2016
  
  30f45925
18 Mar, 2016 2 commits
- Fix version · 1c038637
  Laurent Montel authored Mar 18, 2016
  
  1c038637
- Fix akonadi version · 84292e3a
  Laurent Montel authored Mar 18, 2016
  
  84292e3a
17 Mar, 2016 1 commit
- Astyle kdelibs · 6ff29697
  Laurent Montel authored Mar 17, 2016
  
  6ff29697
13 Mar, 2016 1 commit
- Prepare 16.04 · 58c9a430
  Laurent Montel authored Mar 13, 2016
  
  58c9a430
04 Mar, 2016 1 commit
- Clean up includes · d445b9ed
  Laurent Montel authored Mar 04, 2016
  
  d445b9ed
19 Feb, 2016 1 commit

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

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"

151e9f85

18 Feb, 2016 1 commit
- increase version · 4570236a
  Laurent Montel authored Feb 18, 2016
  
  4570236a
14 Feb, 2016 2 commits
- Move the module version variable to the top. · f2ec5b85
  Armin K authored Feb 14, 2016
  
  f2ec5b85
- SVN_SILENT made messages (.desktop file) - always resolve ours · 56516ddf
  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"
```
  56516ddf
30 Jan, 2016 1 commit

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

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

f7afb1c8

28 Jan, 2016 1 commit
- Let KDE*CompilerSettings change the policies in the project · 492c2394
  Aleix Pol Gonzalez authored Jan 28, 2016
```
As suggested in ECM documentation.
```
  492c2394
23 Jan, 2016 1 commit

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

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

03153b0d

16 Jan, 2016 1 commit
- increase version · 9bcdc97f
  Laurent Montel authored Jan 16, 2016
  
  9bcdc97f
15 Jan, 2016 1 commit
- Fix dnd support · 47ad27f3
  Laurent Montel authored Jan 15, 2016
  
  47ad27f3
10 Jan, 2016 1 commit

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

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

797b3ccd

05 Jan, 2016 1 commit

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

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

b1bd1de4

02 Jan, 2016 1 commit
- Update copyright · ac9a7f21
  Laurent Montel authored Jan 02, 2016
  
  ac9a7f21
30 Dec, 2015 1 commit
- Clean up · 6c9460b0
  Laurent Montel authored Dec 30, 2015
  
  6c9460b0
27 Dec, 2015 1 commit

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

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

f97811d4

24 Dec, 2015 1 commit

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

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

7cdb71b2

22 Dec, 2015 3 commits
- Move in last line · 2cefb11a
  Laurent Montel authored Dec 22, 2015
  
  2cefb11a
- SVN_SILENT made messages (.desktop file) - always resolve ours · 36180aa3
  Script Kiddy authored Dec 22, 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"
```
  36180aa3
- Increase version · df34debb
  Laurent Montel authored Dec 22, 2015
  
  df34debb
21 Dec, 2015 1 commit

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

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"

376f2fdc

19 Dec, 2015 1 commit

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

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

69e9cccf

17 Dec, 2015 2 commits

Search for Qt5Designer · b6005eb9

Heiko Becker authored Dec 17, 2015

Otherwise Qt5Designer_FOUND in src/designer/CMakeLists.txt is always
false and the corresponding code never built.

b6005eb9

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

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"

cc443970

16 Dec, 2015 2 commits
- Fix variables · cc79ff89
  Laurent Montel authored Dec 16, 2015
  
  cc79ff89
- SVN_SILENT made messages (.desktop file) - always resolve ours · b20997b6
  Script Kiddy authored Dec 16, 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"
```
  b20997b6
15 Dec, 2015 1 commit

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

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

460d797d

09 Dec, 2015 4 commits

Add reviewboard. Clean up · 4506805e
Laurent Montel authored Dec 09, 2015

4506805e
Clean up · 4dc182df
Laurent Montel authored Dec 09, 2015

4dc182df
Move libkdepim code to the root directory. · f9cefe35
Nicolás Alvarez authored Dec 08, 2015

f9cefe35

Initial import from the monolithic kdepim. · dc13ca46

Nicolás Alvarez authored Dec 08, 2015

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
techbase wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://community.kde.org/Frameworks/GitOldHistory

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, kdepim master branch, at commit
d0009536f24e8c7f4cc32a70936f5c25194e9a6f

dc13ca46