Commits · 7ff42f659709f8d43dd0b8f807ee9dad1546fc7a · PIM / KDE PIM Add-ons

02 May, 2016 1 commit
- Revert "Remove not necessary linking lib" · 7ff42f65
  Laurent Montel authored May 02, 2016
```
This reverts commit 403aaea3.
```
  7ff42f65
27 Apr, 2016 1 commit
- Remove not necessary linking lib · 403aaea3
  Laurent Montel authored Apr 27, 2016
  
  403aaea3
04 Apr, 2016 1 commit
- Add KF5::I18n · 1c634487
  Laurent Montel authored Apr 04, 2016
  
  1c634487
31 Mar, 2016 1 commit

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

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

0ebf700a

25 Mar, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 5ace95d0
  Script Kiddy authored Mar 25, 2016
  
  5ace95d0
04 Mar, 2016 1 commit

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

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"

2615fe58

12 Jan, 2016 1 commit

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

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

02 Jan, 2016 1 commit
- update copyright · 91daa127
  Laurent Montel authored Jan 02, 2016
  
  91daa127
31 Dec, 2015 1 commit

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

29 Dec, 2015 1 commit

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

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

eaea47be

27 Dec, 2015 1 commit

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

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"

41286476

21 Dec, 2015 1 commit

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

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"

23939160

19 Dec, 2015 1 commit

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

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"

a15eec54

17 Dec, 2015 1 commit

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

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"

6b738a19

16 Dec, 2015 1 commit

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

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"

f046a638

14 Dec, 2015 1 commit

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

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

42913797

13 Dec, 2015 1 commit

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

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

1f3bd35a

12 Dec, 2015 1 commit

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

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

eb495d10

11 Dec, 2015 1 commit

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

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

2b80d502

10 Dec, 2015 1 commit

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

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

b2ccaffc

09 Dec, 2015 1 commit

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

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"

994fe731

08 Dec, 2015 2 commits
- Use json directly. Add version · d876de99
  Laurent Montel authored Dec 08, 2015
  
  d876de99
- SVN_SILENT made messages (.desktop file) - always resolve ours · 876ff59f
  Script Kiddy authored Dec 08, 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"
```
  876ff59f
02 Dec, 2015 1 commit
- Move plugin here · fb4f36c1
  Laurent Montel authored Dec 02, 2015
  
  fb4f36c1