Commits · 7002cb1f07e3a2efcef8a590be9d556dcf8b2ae1 · PIM / KDE PIM Add-ons

02 Feb, 2018 1 commit

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

Script Kiddy authored Feb 02, 2018

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"

7002cb1f

29 Jan, 2018 1 commit

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

Script Kiddy authored Jan 29, 2018

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"

a8516a58

04 Dec, 2017 2 commits

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

Script Kiddy authored Dec 04, 2017

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"

7be51c84

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

Script Kiddy authored Dec 04, 2017

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"

10493eb5

30 Nov, 2017 1 commit
- Disable them by default · 338d463c
  Laurent Montel authored Nov 30, 2017
  
  338d463c
09 Oct, 2017 2 commits

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

Script Kiddy authored Oct 09, 2017

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"

ada4dbbc

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

Script Kiddy authored Oct 09, 2017

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"

bff093cd

11 Sep, 2017 2 commits

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

Script Kiddy authored Sep 11, 2017

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"

1bcb613f

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

Script Kiddy authored Sep 11, 2017

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"

887ac10b

29 Jun, 2017 2 commits

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

Script Kiddy authored Jun 29, 2017

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"

ff12db1c

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

Script Kiddy authored Jun 29, 2017

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"

9b1e9284

13 Jun, 2017 2 commits

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

Script Kiddy authored Jun 13, 2017

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"

280e34f9

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

Script Kiddy authored Jun 13, 2017

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"

d8d4fcf7

09 Apr, 2017 2 commits

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

Script Kiddy authored Apr 09, 2017

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"

c2e74cf1

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

Script Kiddy authored Apr 09, 2017

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"

0926c923

26 Mar, 2017 2 commits

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

Script Kiddy authored Mar 26, 2017

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"

7245ec12

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

Script Kiddy authored Mar 26, 2017

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"

baac84bc

12 Dec, 2016 1 commit

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

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

ed8eda1f

02 Dec, 2016 2 commits

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

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

3ec4a7a3

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

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

f42635cf

30 Nov, 2016 1 commit

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

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

a5400f8a

29 Nov, 2016 2 commits

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

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

b14ebb88

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

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

af536396

25 Nov, 2016 1 commit

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

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

b9df5190

23 Nov, 2016 1 commit

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

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

8adc58bf

22 Nov, 2016 2 commits

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

Script Kiddy authored Nov 22, 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"

cacd6bc9

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

Script Kiddy authored Nov 22, 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"

765f4e9a

05 Nov, 2016 1 commit

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

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

1d2cabc5

04 Nov, 2016 1 commit

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

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

3ef72e73

01 Nov, 2016 1 commit

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

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

2f79fe75

30 Oct, 2016 1 commit

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

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

253c2583

26 Oct, 2016 1 commit

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

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

da1ce999

24 Oct, 2016 1 commit

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

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

95f03987

22 Oct, 2016 1 commit

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

Script Kiddy authored Oct 22, 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"

bc1d1c83

21 Oct, 2016 1 commit

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

Script Kiddy authored Oct 21, 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"

58fa22e9

20 Oct, 2016 1 commit

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

Script Kiddy authored Oct 20, 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"

be30525b

19 Oct, 2016 1 commit

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

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

3d490b0c

18 Oct, 2016 1 commit
- UI messages: fixes (style, grammar) · d19001ca
  Luigi Toscano authored Oct 18, 2016
  
  d19001ca
15 Oct, 2016 1 commit

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

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

3cd8e673

13 Oct, 2016 1 commit

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

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

932b6d57