Commits · 324a5adc6b472812ce898aea6f0a6b080e7b52b1 · PIM / KDE PIM Add-ons

26 Jan, 2016 2 commits
- Add 5.2 · 324a5adc
  Laurent Montel authored Jan 26, 2016
  
  324a5adc
- Move files · e8452f7d
  Laurent Montel authored Jan 26, 2016
  
  e8452f7d
25 Jan, 2016 4 commits
- Start to implement default theme (moderne theme) for kf5.2 · c1954fc5
  Laurent Montel authored Jan 25, 2016
  
  c1954fc5
- Remove it · 173e39c1
  Laurent Montel authored Jan 25, 2016
  
  173e39c1
- Adapt to new api · dba07d5e
  Laurent Montel authored Jan 25, 2016
  
  dba07d5e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 92f82817
  Script Kiddy authored Jan 25, 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"
```
  92f82817
24 Jan, 2016 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c289495c
  Script Kiddy authored Jan 24, 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"
```
  c289495c
- Disable it for the moment · ee76db1e
  Laurent Montel authored Jan 24, 2016
  
  ee76db1e
- Fix load default theme · 3ddcb70b
  Laurent Montel authored Jan 24, 2016
  
  3ddcb70b
- Don't use grantleethememanager here · b9d315a6
  Laurent Montel authored Jan 24, 2016
  
  b9d315a6
23 Jan, 2016 3 commits
- Create a plugin for default grantlee theme · 944f64f6
  Laurent Montel authored Jan 23, 2016
  
  944f64f6
- Attempt to fix the CI build. · 498cf190
  Volker Krause authored Jan 23, 2016
  
  498cf190
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4946b202
  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"
```
  4946b202
22 Jan, 2016 1 commit
- increase version · c34c75a3
  Laurent Montel authored Jan 22, 2016
  
  c34c75a3
21 Jan, 2016 1 commit
- Astyle kdelibs · fdbabe99
  Laurent Montel authored Jan 21, 2016
  
  fdbabe99
18 Jan, 2016 1 commit

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

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

42be69e6

17 Jan, 2016 1 commit

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

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

4f11d8f3

16 Jan, 2016 1 commit
- increase version · 186b18e1
  Laurent Montel authored Jan 16, 2016
  
  186b18e1
15 Jan, 2016 2 commits
- Add libkdepim here too · d04c7659
  Laurent Montel authored Jan 15, 2016
  
  d04c7659
- Add missing lib · ab776be1
  Laurent Montel authored Jan 15, 2016
  
  ab776be1
14 Jan, 2016 1 commit
- The plugin interface change was not intended and is now roll backed. · df2dac00
  Sandro Knauß authored Jan 14, 2016
  
  df2dac00
13 Jan, 2016 1 commit
- Try to adapt api · 2cafd7d9
  Laurent Montel authored Jan 13, 2016
  
  2cafd7d9
12 Jan, 2016 4 commits
- Adapt to new api · 1d2d37fe
  Laurent Montel authored Jan 12, 2016
  
  1d2d37fe
- SVN_SILENT made messages (.desktop file) - always resolve ours · ab56d462
  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"
```
  ab56d462
- increase version · 005b3ce3
  Laurent Montel authored Jan 12, 2016
  
  005b3ce3
- Use class · 73294a38
  Laurent Montel authored Jan 12, 2016
  
  73294a38
11 Jan, 2016 1 commit

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

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

508274ef

10 Jan, 2016 1 commit

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

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"

b62c2dd8

08 Jan, 2016 1 commit

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

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

b3b518a4

07 Jan, 2016 1 commit

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

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

9054b22f

05 Jan, 2016 1 commit

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

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"

2f751fa6

04 Jan, 2016 1 commit
- Adapt to renamed lib · 7060f2af
  Laurent Montel authored Jan 04, 2016
  
  7060f2af
02 Jan, 2016 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 25ae1228
  Script Kiddy authored Jan 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"
```
  25ae1228
- update copyright · 91daa127
  Laurent Montel authored Jan 02, 2016
  
  91daa127
01 Jan, 2016 1 commit

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

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

b2421bf3

31 Dec, 2015 2 commits
- Move example here · 0fe65be9
  Laurent Montel authored Dec 31, 2015
  
  0fe65be9
- SVN_SILENT made messages (.desktop file) - always resolve ours · d22dc3a3
  Script Kiddy authored Dec 31, 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"
```
  d22dc3a3
30 Dec, 2015 2 commits
- UI strings: fix capitalization, better wording · 2148f9f6
  Luigi Toscano authored Dec 30, 2015
  
  2148f9f6
- SVN_SILENT made messages (.desktop file) - always resolve ours · 24a03701
  Script Kiddy authored Dec 30, 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"
```
  24a03701
29 Dec, 2015 1 commit
- Fix spelling of vCard · 05d56501
  Luigi Toscano authored Dec 29, 2015
  
  05d56501