Commits · 12bf83b0abd064f22c0a137b0ec7123f155c3097 · Thomas Schöps / kdevelop

22 Aug, 2019 1 commit

Indicate appsteam the ps desktop file isn't a separate application · 12bf83b0

Aleix Pol Gonzalez authored Aug 21, 2019

Reviewers: kossebau, ngraham

Subscribers: kdevelop-devel

Tags: #kdevelop

Differential Revision: https://phabricator.kde.org/D23321

BUG: 410687

12bf83b0

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

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

19 Apr, 2018 1 commit

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

Script Kiddy authored Apr 19, 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"

304f0e40

04 Jan, 2018 1 commit

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

Script Kiddy authored Jan 04, 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"

8ceabdb7

27 Nov, 2017 1 commit

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

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

eb89ac10

17 Nov, 2017 1 commit

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

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

d80ec0c0

16 Nov, 2017 1 commit

Fix registration of kdevelop as handler of kdev4 files · 464f84a0

Friedrich W. H. Kossebau authored Nov 16, 2017

Summary:
Also fix data of mimetype registration of kdev4 files:
* use application/ due to being an app-specific format
* set subtype
* set generic icon to kdevelop

Reviewers: #kdevelop, apol

Reviewed By: #kdevelop, apol

Subscribers: kdevelop-devel

Differential Revision: https://phabricator.kde.org/D8853

464f84a0

10 Nov, 2017 1 commit

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

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

96e1d24a

12 Sep, 2017 1 commit

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

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

182862d3

10 Sep, 2017 1 commit

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

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

079e725d

09 Sep, 2017 1 commit

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

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

8e5a3755

05 Sep, 2017 1 commit

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

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

26bf1a86

04 Sep, 2017 1 commit

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

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

a1ca46b9

02 Sep, 2017 1 commit

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

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

c8f869e7

01 Sep, 2017 1 commit

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

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

65f2e7de

30 Aug, 2017 2 commits
- Add Comment entry to .desktop files · 6b955cde
  Kevin Funk authored Aug 30, 2017
```
BUG: 351948
FIXED-IN: 5.2.0
```
  6b955cde
- 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

28 Apr, 2017 1 commit

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

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

d635e570

21 Aug, 2016 2 commits

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

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

6d7ee650

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

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

28f88b5d

01 Aug, 2016 2 commits

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

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

cd542bc9

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

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

275d5559

31 May, 2016 1 commit
- Use reverse-dns naming as suggested by the specs for desktop and appdata files · 345b1256
  Aleix Pol Gonzalez authored May 31, 2016
  
  345b1256
29 Jan, 2016 2 commits
- SVN_SILENT made messages (.desktop file) · 7cd0e4cd
  Script Kiddy authored Jan 29, 2016
  
  7cd0e4cd
- SVN_SILENT made messages (.desktop file) - always resolve ours · 671fccee
  Script Kiddy authored Jan 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"
```
  671fccee
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
01 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 70bf6266
  Script Kiddy authored Nov 01, 2015
  
  70bf6266
- SVN_SILENT made messages (.desktop file) - always resolve ours · 3a81c6e6
  Script Kiddy authored Nov 01, 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"
```
  3a81c6e6
27 Oct, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · 8d28fcbf
  Script Kiddy authored Oct 27, 2015
  
  8d28fcbf
- SVN_SILENT made messages (.desktop file) - always resolve ours · d4a84aa6
  Script Kiddy authored Oct 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"
```
  d4a84aa6
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

10 Aug, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 14eaee85
  Script Kiddy authored Aug 10, 2015
  
  14eaee85
24 Jun, 2015 1 commit

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

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

1aea7a4b

22 Jun, 2015 1 commit

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

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

417794e0

19 Jun, 2015 1 commit

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

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

b692df27

15 Jun, 2015 1 commit

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

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

987ffa16