Commits · master · KDE / kdev-python

16 Feb, 2020 1 commit
- 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 4 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
- GIT_SILENT made messages (after extraction) · e5ecfa57
  Script Kiddy authored Jan 15, 2020
  
  e5ecfa57
02 Jan, 2020 1 commit
- Set version number to 5.4.6 · 5da400b9
  Friedrich W. H. Kossebau authored Jan 02, 2020
  
  5da400b9
22 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · e2dd8680
  Script Kiddy authored Dec 22, 2019
  
  e2dd8680
02 Dec, 2019 1 commit
- Merge branch '5.4' · 4ab11c20
  Friedrich W. H. Kossebau authored Dec 02, 2019
  
  4ab11c20
01 Dec, 2019 1 commit
- Set version number to 5.4.5 · 03f29092
  Friedrich W. H. Kossebau authored Dec 01, 2019
  
  03f29092
27 Nov, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 407836a5
  Script Kiddy authored Nov 27, 2019
  
  407836a5
12 Nov, 2019 1 commit
- Use official IDocumentController::activeTextDocumentView() over cast-hack · df98779c
  Friedrich W. H. Kossebau authored Nov 12, 2019
  
  df98779c
03 Nov, 2019 1 commit
- Set version number to 5.4.4 · 2b229ad7
  Friedrich W. H. Kossebau authored Nov 03, 2019
  
  2b229ad7
28 Oct, 2019 2 commits

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

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

a268f6da

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

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

212c864d

23 Oct, 2019 1 commit

Initial Python 3.8 support. · e23fa8f1

Francis Herne authored Sep 20, 2019

This allows kdev-python to be built and run against CPython 3.8,
 and if so to parse files containing 3.8 syntax.

BUG: 411956
FIXED-IN: 5.5.0

e23fa8f1

14 Oct, 2019 2 commits
- Merge branch '5.4' · a0cd08da
  Friedrich W. H. Kossebau authored Oct 15, 2019
  
  a0cd08da
- Set version number to 5.4.3 · 1bc5c709
  Friedrich W. H. Kossebau authored Oct 14, 2019
  
  1bc5c709
01 Oct, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 7c5ca311
  Script Kiddy authored Oct 01, 2019
  
  7c5ca311
14 Sep, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ce018e99
  Script Kiddy authored Sep 14, 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"
```
  ce018e99
- GIT_SILENT made messages (after extraction) · dafc977e
  Script Kiddy authored Sep 14, 2019
  
  dafc977e
02 Sep, 2019 3 commits
- Merge branch '5.4' · 23c20d52
  Friedrich W. H. Kossebau authored Sep 02, 2019
  
  23c20d52
- Set version number to 5.4.2 · 6b04eb95
  Friedrich W. H. Kossebau authored Sep 02, 2019
  
  6b04eb95
- Include KDECompilerSettings after KDECMakeSettings · 93182eb8
  Friedrich W. H. Kossebau authored Sep 02, 2019
```
GIT_SILENT
```
  93182eb8
20 Aug, 2019 1 commit

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

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

f0ba0c59