Commits · master · Education / KTurtle

18 Jan, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 7aa9ba25
  Script Kiddy authored Jan 18, 2021
  
  7aa9ba25
02 Jan, 2021 1 commit
- GIT_SILENT Update Appstream for new release · 500ff310
  Christoph Feck authored Jan 02, 2021
```
(cherry picked from commit dc7e71f1)
```
  500ff310
29 Dec, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 20022347
  Script Kiddy authored Dec 29, 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"
```
  20022347
- GIT_SILENT made messages (after extraction) · 3c4c5c0f
  Script Kiddy authored Dec 29, 2020
  
  3c4c5c0f
10 Dec, 2020 1 commit
- operator+/- is disabled for QFlags in qt6 · ec361e33
  Laurent Montel authored Dec 10, 2020
  
  ec361e33
02 Dec, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 6bd21675
  Christoph Feck authored Dec 02, 2020
```
(cherry picked from commit 6d18dddb)
```
  6bd21675
26 Nov, 2020 1 commit

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

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

fc73a915

20 Nov, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 5668aa21
  Script Kiddy authored Nov 20, 2020
  
  5668aa21
13 Nov, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.12' · ab1d8a0c
  Albert Astals Cid authored Nov 13, 2020
  
  ab1d8a0c
- Add missing kdoctools_install · c2d207dd
  Albert Astals Cid authored Nov 13, 2020
  
  c2d207dd
08 Nov, 2020 2 commits
- GIT_SILENT Upgrade release service version to 21.03.70. · f7a0ede7
  Albert Astals Cid authored Nov 08, 2020
  
  f7a0ede7
- GIT_SILENT Upgrade release service version to 20.11.80. · 5b1486ff
  Albert Astals Cid authored Nov 08, 2020
  
  5b1486ff
31 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 091b2dcd
  Christoph Feck authored Oct 31, 2020
```
(cherry picked from commit 7baf66d6)
```
  091b2dcd
23 Oct, 2020 1 commit
- If include is define in .h remove it if it's defined in .cpp too (scripted) · a1bbb18d
  Laurent Montel authored Oct 23, 2020
  
  a1bbb18d
03 Oct, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 1d226a12
  Christoph Feck authored Oct 03, 2020
```
(cherry picked from commit a748b512)
```
  1d226a12
22 Sep, 2020 1 commit
- Remove explicit ECM_KDE_MODULE_DIR · 181eccf3
  Laurent Montel authored Sep 22, 2020
  
  181eccf3
20 Sep, 2020 5 commits
- Manual formatting of license headers · 235fad39
  Andreas Cord-Landwehr authored Sep 20, 2020
  
  235fad39
- Manual conversion of exotic file types · ea9b5ad2
  Andreas Cord-Landwehr authored Sep 20, 2020
  
  ea9b5ad2
- Remove obsolete COPYING file · 5e0c266e
  Andreas Cord-Landwehr authored Sep 20, 2020
  
  5e0c266e
- Add license texts according to REUSE specification · f34b6687
  Andreas Cord-Landwehr authored Sep 20, 2020
  
  f34b6687
- Convert license statements to SPDX expressions · db56ac49
  Andreas Cord-Landwehr authored Sep 20, 2020
  
  db56ac49
14 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 5a4e199e
  Script Kiddy authored Sep 14, 2020
  
  5a4e199e
09 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · ecd6f97f
  Script Kiddy authored Sep 09, 2020
  
  ecd6f97f
08 Sep, 2020 1 commit
- add content rating · ecad050c
  Kukuh Syafaat authored Sep 08, 2020
  
  ecad050c
06 Sep, 2020 1 commit
- Improve i18n tooling · 857d8a3d
  Andreas Cord-Landwehr authored Sep 06, 2020
  
  857d8a3d
31 Aug, 2020 1 commit
- GIT_SILENT Update Appstream for new release · 76c78f77
  Christoph Feck authored Aug 31, 2020
```
(cherry picked from commit ae4d5bf8)
```
  76c78f77
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