Commits · 4cd22b23277c5c8fdce98cf7c3145c10cfd7504d · Multimedia / Kdenlive

20 Aug, 2021 1 commit

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

Script Kiddy authored Aug 20, 2021

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"

4cd22b23

17 May, 2021 2 commits

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

Script Kiddy authored May 17, 2021

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"

6defcfd5

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

Script Kiddy authored May 17, 2021

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"

f1540a8b

15 May, 2021 2 commits

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

Script Kiddy authored May 15, 2021

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"

8da9e91b

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

Script Kiddy authored May 15, 2021

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"

d78b2b9a

19 Apr, 2021 2 commits

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

Script Kiddy authored Apr 19, 2021

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"

8734dfa0

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

Script Kiddy authored Apr 19, 2021

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"

ae8bc315

10 Apr, 2021 2 commits

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

Script Kiddy authored Apr 10, 2021

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"

e2590f2b

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

Script Kiddy authored Apr 10, 2021

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"

47793b3c

07 Apr, 2021 2 commits

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

Script Kiddy authored Apr 07, 2021

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"

efda2dc3

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

Script Kiddy authored Apr 07, 2021

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"

7c847410

04 Apr, 2021 2 commits

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

Script Kiddy authored Apr 04, 2021

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"

3724e5a4

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

Script Kiddy authored Apr 04, 2021

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"

f4dabe7f

28 Mar, 2021 1 commit

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

Script Kiddy authored Mar 28, 2021

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"

64caa61b

21 Mar, 2021 1 commit

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

Script Kiddy authored Mar 21, 2021

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"

8056a2ee

16 Mar, 2021 1 commit

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

Script Kiddy authored Mar 16, 2021

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"

4b767561

15 Mar, 2021 1 commit

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

Script Kiddy authored Mar 15, 2021

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"

301788c4

08 Mar, 2021 1 commit

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

Script Kiddy authored Mar 08, 2021

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"

71a66b56

03 Mar, 2021 1 commit

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

Script Kiddy authored Mar 03, 2021

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"

3772ed04

01 Mar, 2021 1 commit

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

Script Kiddy authored Mar 01, 2021

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"

7fcdbfde

28 Feb, 2021 1 commit

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

Script Kiddy authored Feb 28, 2021

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"

a7e29e8d

27 Feb, 2021 1 commit

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

Script Kiddy authored Feb 27, 2021

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"

1fbc6e7a

25 Feb, 2021 1 commit

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

Script Kiddy authored Feb 25, 2021

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"

99620644

24 Feb, 2021 1 commit

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

Script Kiddy authored Feb 24, 2021

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"

3f405794

23 Feb, 2021 1 commit

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

Script Kiddy authored Feb 23, 2021

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"

31aeac5e

22 Feb, 2021 1 commit
- Add missing KNewStuff file · 0d108599
  Julius Künzel authored Feb 22, 2021
  
  0d108599