Commits · master · Education / KTurtle

05 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · e2f0eefb
  Christoph Feck authored Aug 05, 2020
```
(cherry picked from commit dda18621)
```
  e2f0eefb
28 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 46b82786
  Script Kiddy authored Jul 28, 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"
```
  46b82786
- GIT_SILENT made messages (after extraction) · 3e15c4fe
  Script Kiddy authored Jul 28, 2020
  
  3e15c4fe
27 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f2607941
  Script Kiddy authored Jul 27, 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"
```
  f2607941
- GIT_SILENT made messages (after extraction) · ef781d0b
  Script Kiddy authored Jul 27, 2020
  
  ef781d0b
11 Jul, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.11.70. · fe41a4ce
  Albert Astals Cid authored Jul 11, 2020
  
  fe41a4ce
08 Jul, 2020 1 commit

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

Script Kiddy authored Jul 08, 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"

ce26834d

04 Jul, 2020 1 commit
- KRandom -> QRandomGenerator · b6200b0c
  Albert Astals Cid authored Jul 04, 2020
  
  b6200b0c
03 Jul, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 419edaca
  Christoph Feck authored Jul 03, 2020
```
(cherry picked from commit 8c3aa6fb)
```
  419edaca
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0433384d
  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"
```
  0433384d
- GIT_SILENT made messages (after extraction) · 673002cf
  Script Kiddy authored Jun 18, 2020
  
  673002cf
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 816ff15d
  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"
```
  816ff15d
- GIT_SILENT made messages (after extraction) · 41cc4e15
  Script Kiddy authored Jun 17, 2020
  
  41cc4e15
08 Jun, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 460915a3
  Christoph Feck authored Jun 08, 2020
```
(cherry picked from commit c29599ca)
```
  460915a3
14 May, 2020 1 commit
- Fix minor typos · a2a30008
  Yuri Chornoivan authored May 14, 2020
  
  a2a30008
12 May, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d1aa9b67
  Script Kiddy authored May 12, 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"
```
  d1aa9b67
- GIT_SILENT made messages (after extraction) · 0a9c4e17
  Script Kiddy authored May 12, 2020
  
  0a9c4e17
11 May, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 9707b6b8
  Christoph Feck authored May 11, 2020
```
(cherry picked from commit e1d202ae)
```
  9707b6b8
01 May, 2020 1 commit
- Merge remote-tracking branch 'origin/release/20.04' · cdc1c65f
  Pino Toscano authored May 01, 2020
  
  cdc1c65f
19 Apr, 2020 1 commit
- Remove too strict Qt/KF5 deprecation rule. GIT_SILENT · 057e4fd4
  David Faure authored Apr 20, 2020
  
  057e4fd4
15 Apr, 2020 3 commits
- GIT_SILENT Update Appstream for new release · 36df2c37
  Christoph Feck authored Apr 15, 2020
```
(cherry picked from commit a6546f44)
```
  36df2c37
- GIT_SILENT Update Appstream for new release · a6546f44
  Christoph Feck authored Apr 15, 2020
  
  a6546f44
- GIT_SILENT Upgrade release service version to 20.04.0. · 9b04c2a4
  Christoph Feck authored Apr 15, 2020
  
  9b04c2a4
02 Apr, 2020 2 commits

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

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

cf7f47c6

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

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

360bdc24

28 Mar, 2020 1 commit
- GIT_SILENT Upgrade release service version to 20.03.90. · a6a9f415
  Christoph Feck authored Mar 28, 2020
  
  a6a9f415
27 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · e1ba9ba8
  Script Kiddy authored Mar 27, 2020
  
  e1ba9ba8
15 Mar, 2020 2 commits
- GIT_SILENT Upgrade release service version to 20.03.80. · f233f817
  Albert Astals Cid authored Mar 15, 2020
  
  f233f817
- GIT_SILENT Upgrade release service version to 20.07.70. · 8715fa08
  Albert Astals Cid authored Mar 15, 2020
  
  8715fa08
04 Mar, 2020 1 commit
- Make it compile against qt5.15. SkipEmptyParts is part of Qt::. · 568ac897
  Laurent Montel authored Mar 04, 2020
  
  568ac897
01 Mar, 2020 2 commits
- Merge remote-tracking branch 'origin/release/19.12' · 08c10464
  Pino Toscano authored Mar 01, 2020
  
  08c10464
- appdata: improve URLs · d1742cf2
  Pino Toscano authored Mar 01, 2020
```
- use https
- use canonical docs.kde.org help location
```
  d1742cf2
29 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.3. · 8ea0ab6c
  Christoph Feck authored Feb 29, 2020
  
  8ea0ab6c
03 Feb, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 6fa36d73
  Christoph Feck authored Feb 04, 2020
  
  6fa36d73
02 Feb, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.2. · 8395fa05
  Christoph Feck authored Feb 02, 2020
  
  8395fa05
31 Jan, 2020 1 commit
- Use safe hardcoded value for ProvidersUrl · 4ed5f2cb
  Yuri Chornoivan authored Jan 31, 2020
```
https://marc.info/?l=kde-core-devel&m=158043297319851&w=2
```
  4ed5f2cb
30 Jan, 2020 1 commit
- Use the default address for KNewStuff instead of the hardcoded · ea81c694
  Yuri Chornoivan authored Jan 30, 2020
  
  ea81c694
08 Jan, 2020 1 commit
- addVersionOption()/addHelpOption() already adds by KAboutData::setApplicationData · 60efbeef
  Laurent Montel authored Jan 08, 2020
  
  60efbeef
06 Jan, 2020 1 commit
- Update Appstream for new release · 5905db9f
  Christoph Feck authored Jan 06, 2020
  
  5905db9f
05 Jan, 2020 1 commit
- GIT_SILENT Upgrade KDE Applications version to 19.12.1. · fe4abdf6
  Christoph Feck authored Jan 05, 2020
  
  fe4abdf6