Commits · b7dd5a0e94da11f3cc64c7d639d5524de8468311 · blobfish / kdevelop

13 Feb, 2018 1 commit

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

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

b7dd5a0e

22 Nov, 2017 1 commit
- Use kdevelop icon for all plugins without an existing own icon · 4182c472
  Friedrich W. H. Kossebau authored Nov 23, 2017
  
  4182c472
24 Sep, 2017 1 commit

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

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

2cf172fb

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 · 4220f830

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"

4220f830

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

11 Aug, 2017 1 commit

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

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

ab4df19d

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

14 Sep, 2016 1 commit

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

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

e309a02b

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

29 Jan, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 7cd0e4cd
  Script Kiddy authored Jan 29, 2016
  
  7cd0e4cd
23 Jan, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · cfd90ee9
  Script Kiddy authored Jan 23, 2016
  
  cfd90ee9
16 Jan, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 3b3b6bf6
  Script Kiddy authored Jan 16, 2016
  
  3b3b6bf6
09 Jan, 2016 2 commits
- SVN_SILENT made messages (.desktop file) · 68729852
  Script Kiddy authored Jan 09, 2016
  
  68729852
- SVN_SILENT made messages (.desktop file) - always resolve ours · 60bb2f4f
  Script Kiddy authored Jan 09, 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"
```
  60bb2f4f
29 Dec, 2015 1 commit

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

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"

d59e6df2

08 Dec, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · f77731e9
  Script Kiddy authored Dec 08, 2015
  
  f77731e9
16 Nov, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 2e9c05c7
  Script Kiddy authored Nov 16, 2015
  
  2e9c05c7
06 Nov, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 8543224f
  Script Kiddy authored Nov 06, 2015
  
  8543224f
04 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 22bae8e5
  Script Kiddy authored Nov 04, 2015
  
  22bae8e5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 60fd9dc0
  Script Kiddy authored Nov 04, 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"
```
  60fd9dc0
02 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 41065678
  Script Kiddy authored Nov 02, 2015
  
  41065678
- SVN_SILENT made messages (.desktop file) - always resolve ours · 58b7959e
  Script Kiddy authored Nov 02, 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"
```
  58b7959e
31 Oct, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · e0d6a9b4
  Script Kiddy authored Oct 31, 2015
  
  e0d6a9b4
29 Oct, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 535f57db
  Script Kiddy authored Oct 29, 2015
  
  535f57db
28 Oct, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 701ad673
  Script Kiddy authored Oct 28, 2015
  
  701ad673
27 Oct, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 8d28fcbf
  Script Kiddy authored Oct 27, 2015
  
  8d28fcbf
08 Sep, 2015 1 commit

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

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

51ee888f

13 May, 2015 1 commit

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

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

60a7102e