Commits · master · KDevelop / KDevelop Python Support

19 Jun, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 596a149d
  Script Kiddy authored Jun 19, 2020
  
  596a149d
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 78e0c3f3
  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"
```
  78e0c3f3
- GIT_SILENT made messages (after extraction) · 06fe2dcd
  Script Kiddy authored Jun 18, 2020
  
  06fe2dcd
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 21ef4511
  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"
```
  21ef4511
- GIT_SILENT made messages (after extraction) · 9da4b59c
  Script Kiddy authored Jun 17, 2020
  
  9da4b59c
02 Jun, 2020 2 commits
- Merge branch '5.5' · a34b6403
  Friedrich W. H. Kossebau authored Jun 02, 2020
  
  a34b6403
- appdata: update release info for 5.5.2 · c5717cdd
  Friedrich W. H. Kossebau authored Jun 02, 2020
```
GIT_SILENT
```
  c5717cdd
25 May, 2020 1 commit
- Set version number to 5.5.2 · 35f2e1bf
  Friedrich W. H. Kossebau authored May 25, 2020
  
  35f2e1bf
05 May, 2020 2 commits
- Merge branch '5.5' · 1716d973
  Friedrich W. H. Kossebau authored May 05, 2020
  
  1716d973
- appdata: update release info for 5.5.1 · 982df458
  Friedrich W. H. Kossebau authored May 05, 2020
```
GIT_SILENT
```
  982df458
01 May, 2020 1 commit
- Set version number to 5.5.1 · b3a26338
  Friedrich W. H. Kossebau authored May 02, 2020
  
  b3a26338
30 Apr, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 9e946744
  Script Kiddy authored Apr 30, 2020
  
  9e946744
06 Apr, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 7738e145
  Script Kiddy authored Apr 06, 2020
  
  7738e145
- GIT_SILENT made messages (after extraction) · ee12e0ab
  Script Kiddy authored Apr 06, 2020
  
  ee12e0ab
04 Apr, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 3cfd90e0
  Script Kiddy authored Apr 04, 2020
  
  3cfd90e0
- GIT_SILENT made messages (after extraction) · eee8f9c0
  Script Kiddy authored Apr 04, 2020
  
  eee8f9c0
01 Apr, 2020 1 commit
- GIT_SILENT made messages (after extraction) · e7bc8d91
  Script Kiddy authored Apr 01, 2020
  
  e7bc8d91
24 Feb, 2020 1 commit
- Fix link to API dox about DUChain design · 767b145e
  Friedrich W. H. Kossebau authored Feb 24, 2020
```
GIT_SILENT
```
  767b145e
17 Feb, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 6eaa7a4c
  Script Kiddy authored Feb 17, 2020
  
  6eaa7a4c
16 Feb, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 04b2132d
  Script Kiddy authored Feb 16, 2020
  
  04b2132d
- GIT_SILENT made messages (after extraction) · ed46d87b
  Script Kiddy authored Feb 16, 2020
  
  ed46d87b
15 Feb, 2020 2 commits
- Merge remote-tracking branch 'origin/5.5' · 082ec2b5
  Pino Toscano authored Feb 15, 2020
  
  082ec2b5
- appdata: sort versions from newest to oldest · 982a8be6
  Pino Toscano authored Feb 15, 2020
```
Just like appstream recommends.
```
  982a8be6
04 Feb, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 872d512f
  Script Kiddy authored Feb 04, 2020
  
  872d512f
- GIT_SILENT made messages (after extraction) · e9c6fd94
  Script Kiddy authored Feb 04, 2020
  
  e9c6fd94
03 Feb, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1a7d3af1
  Script Kiddy authored Feb 03, 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"
```
  1a7d3af1
- GIT_SILENT made messages (after extraction) · 44932662
  Script Kiddy authored Feb 03, 2020
  
  44932662
02 Feb, 2020 2 commits
- Merge branch '5.5' · 20249a59
  Friedrich W. H. Kossebau authored Feb 02, 2020
  
  20249a59
- appdata: update release info for 5.5.0 · 4d98a68a
  Friedrich W. H. Kossebau authored Feb 02, 2020
```
GIT_SILENT
```
  4d98a68a
31 Jan, 2020 1 commit
- Set version number to 5.5.0 · 7ad90310
  Friedrich W. H. Kossebau authored Feb 01, 2020
  
  7ad90310
25 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · d6b83560
  Script Kiddy authored Jan 25, 2020
  
  d6b83560
22 Jan, 2020 3 commits
- Bump version to 5.5.40 · 58efee4f
  Friedrich W. H. Kossebau authored Jan 22, 2020
  
  58efee4f
- GIT_SILENT made messages (after extraction) · 69e68d43
  Script Kiddy authored Jan 22, 2020
  
  69e68d43
- Set version number to 5.4.80 · 721a90ec
  Friedrich W. H. Kossebau authored Jan 22, 2020
  
  721a90ec
21 Jan, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e65cf57c
  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"
```
  e65cf57c
- GIT_SILENT made messages (after extraction) · ce33d302
  Script Kiddy authored Jan 21, 2020
  
  ce33d302
20 Jan, 2020 1 commit
- Merge branch '5.4' · d5b24a63
  Friedrich W. H. Kossebau authored Jan 20, 2020
  
  d5b24a63
15 Jan, 2020 3 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · aa925c6f
  Script Kiddy authored Jan 15, 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"
```
  aa925c6f
- GIT_SILENT made messages (after extraction) · 68bfd238
  Script Kiddy authored Jan 15, 2020
  
  68bfd238
- SVN_SILENT made messages (.desktop file) - always resolve ours · 48070b53
  Script Kiddy authored Jan 15, 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"
```
  48070b53