Commits · dda833dbddd7884d37950be5b1db937f108f50cd · KDevelop / KDevelop

11 Oct, 2020 1 commit

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

Script Kiddy authored Oct 11, 2020

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"

dda833db

17 Aug, 2020 1 commit

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

Script Kiddy authored Aug 17, 2020

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"

e1c6fa44

18 Jun, 2020 2 commits

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

Script Kiddy authored Jun 18, 2020

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"

7dfd81aa

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

Script Kiddy authored Jun 18, 2020

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"

99c8c3e9

17 Jun, 2020 2 commits

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

Script Kiddy authored Jun 17, 2020

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"

1363c28f

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

Script Kiddy authored Jun 17, 2020

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"

819fa2fc

13 Apr, 2020 2 commits

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

Script Kiddy authored Apr 13, 2020

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"

1c5c5ae1

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

Script Kiddy authored Apr 13, 2020

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"

73e76e9b

24 Jan, 2020 1 commit

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

Script Kiddy authored Jan 24, 2020

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"

ab8dd731

21 Jan, 2020 1 commit

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

Script Kiddy authored Jan 21, 2020

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"

d9c7403d

17 Jan, 2020 1 commit

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

Script Kiddy authored Jan 17, 2020

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"

34e874d7

11 Dec, 2019 2 commits

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

Script Kiddy authored Dec 11, 2019

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"

10b5beff

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

Script Kiddy authored Dec 11, 2019

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"

8c631f09

29 Aug, 2019 1 commit

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

Script Kiddy authored Aug 29, 2019

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"

58838e02

24 Jul, 2019 1 commit

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

Script Kiddy authored Jul 24, 2019

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"

15873f22

22 Jul, 2019 1 commit

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

Script Kiddy authored Jul 22, 2019

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"

8fa9c17e

06 Jan, 2019 2 commits

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

Script Kiddy authored Jan 06, 2019

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"

97a1bbfb

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

Script Kiddy authored Jan 06, 2019

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"

2468045f

24 Oct, 2018 2 commits

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

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

d32c52b0

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

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

52858040

29 Aug, 2018 1 commit

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

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

8c76348b

26 Aug, 2018 1 commit

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

Script Kiddy authored Aug 26, 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"

94ebc6b3

13 Sep, 2017 1 commit

Restructure kdevelop.git layout · bd9d1e30

Kevin Funk authored Sep 05, 2017

As discussed on the mailing list:
  https://mail.kde.org/pipermail/kdevelop-devel/2017-September/058823.html

Move all plugins into a single folder:
- $CATEGORY/$PLUGINFOLDER -> plugins/$PLUGINFOLDER
- kdevplatform/plugins/$PLUGINFOLDER -> plugins/$PLUGINFOLDER

bd9d1e30

30 Aug, 2017 1 commit

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

Script Kiddy authored Aug 30, 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"

ced61b50

29 Aug, 2017 1 commit

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

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

36715f37

09 Aug, 2017 2 commits

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

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

71e8140b

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

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

93d22be8

20 Jun, 2017 1 commit

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

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

580c39e9

09 Apr, 2017 2 commits

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

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"

c5770032

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

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"

dc549f8d

07 Mar, 2017 1 commit

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

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

a19541c4

04 Mar, 2017 1 commit

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

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

6d8799f0

02 Dec, 2016 2 commits

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

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"

0a2656a2

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

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"

4a6d81f8

30 Nov, 2016 1 commit

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

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"

5551a1c7

25 Nov, 2016 1 commit

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

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"

d4004303

23 Nov, 2016 1 commit

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

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"

db17d6ca

22 Nov, 2016 1 commit

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

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"

8f8eee4e

28 Sep, 2016 1 commit

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

Script Kiddy authored Sep 28, 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"

22816aee

06 Feb, 2016 1 commit

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

Script Kiddy authored Feb 06, 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"

da0f0599