Commits · e97f140a566bb22f554dc1d8470c833d9f3cb8ea · PIM / KDE PIM Add-ons

30 Jan, 2016 1 commit

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

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"

e97f140a

29 Jan, 2016 1 commit

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

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

c99679bd

28 Jan, 2016 2 commits
- Create new plugin · 185d5c7a
  Laurent Montel authored Jan 28, 2016
  
  185d5c7a
- Astyle kdelibs · e65a3bfa
  Laurent Montel authored Jan 28, 2016
  
  e65a3bfa
27 Jan, 2016 4 commits
- fix copyright · e3ced541
  Laurent Montel authored Jan 27, 2016
  
  e3ced541
- Don't show trash icon when we can't move to trash · e0eeba58
  Laurent Montel authored Jan 27, 2016
  
  e0eeba58
- -Wmissing-include-dirs · 49b0f747
  Christophe Giboudeaux authored Jan 14, 2016
  
  49b0f747
- SVN_SILENT made messages (.desktop file) - always resolve ours · 67339137
  Script Kiddy authored Jan 27, 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"
```
  67339137
26 Jan, 2016 9 commits
- Exclude action when we print message · f1c40dda
  Laurent Montel authored Jan 26, 2016
  
  f1c40dda
- Fix icons position · 73c1e52a
  Laurent Montel authored Jan 26, 2016
  
  73c1e52a
- Add more actions · 6115cd6f
  Laurent Montel authored Jan 26, 2016
  
  6115cd6f
- improve theme · 3099fd74
  Laurent Montel authored Jan 26, 2016
  
  3099fd74
- SVN_SILENT made messages (.desktop file) - always resolve ours · 102664e1
  Script Kiddy authored Jan 26, 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"
```
  102664e1
- Add action in mail · 62fa615c
  Laurent Montel authored Jan 26, 2016
  
  62fa615c
- Add theme based on "Breeze Flat" We need to refresh a little default theme · 398b8cc4
  Laurent Montel authored Jan 26, 2016
  
  398b8cc4
- 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 3 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