Commits · master · SDK / Dolphin Plugins

18 Sep, 2020 2 commits
- Port away from KRun · f72c3036
  Alexander Lohnau authored Sep 18, 2020
  
  f72c3036
- GIT_SILENT made messages (after extraction) · 0bf959d6
  Script Kiddy authored Sep 18, 2020
  
  0bf959d6
17 Sep, 2020 1 commit

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

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

5b83d8fd

16 Sep, 2020 2 commits
- Post last deprecated QProcess usage · 3c27d443
  Alexander Lohnau authored Sep 16, 2020
  
  3c27d443
- Port QProcess::start(QString) methods · c362f621
  Alexander Lohnau authored Sep 16, 2020
  
  c362f621
15 Sep, 2020 1 commit
- Compile with QT_NO_FOREACH QT_NO_KEYWORDS · eaef1920
  Alexander Lohnau authored Sep 15, 2020
  
  eaef1920
13 Sep, 2020 2 commits
- Port Qt4 style connects · c67ff4dd
  Alexander Lohnau authored Sep 13, 2020
  
  c67ff4dd
- Port deprecated QProces::start method · a3e1bb78
  Alexander Lohnau authored Sep 13, 2020
  
  a3e1bb78
02 Sep, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5b7ad6b9
  Script Kiddy authored Sep 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"
```
  5b7ad6b9
- GIT_SILENT made messages (after extraction) · 5da203ad
  Script Kiddy authored Sep 02, 2020
  
  5da203ad
28 Aug, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · e211da0c
  Script Kiddy authored Aug 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"
```
  e211da0c
- GIT_SILENT made messages (after extraction) · 3daccd48
  Script Kiddy authored Aug 28, 2020
  
  3daccd48
24 Aug, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 34683a69
  Script Kiddy authored Aug 24, 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"
```
  34683a69
- GIT_SILENT made messages (after extraction) · 207f2328
  Script Kiddy authored Aug 24, 2020
  
  207f2328
23 Aug, 2020 2 commits
- Merge branch 'release/20.08' into master · 6722e662
  Elvis Angelaccio authored Aug 23, 2020
  
  6722e662
- Fix compile with Clang 10.0.1 · 18f486cc
  Rafael Sadowski authored Aug 23, 2020
```
error: '__sF' declared as array of references of type 'QString (&)'
```
  18f486cc
20 Aug, 2020 1 commit

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

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

64e2b26b

04 Aug, 2020 2 commits

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

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

a5eed5d7

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

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

39dd9b7a

29 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · c3b523cf
  Script Kiddy authored Jul 29, 2020
  
  c3b523cf
28 Jul, 2020 2 commits
- GIT_SILENT made messages (after extraction) · 81c95c7f
  Script Kiddy authored Jul 28, 2020
  
  81c95c7f
- GIT_SILENT made messages (after extraction) · 0b5d2655
  Script Kiddy authored Jul 28, 2020
  
  0b5d2655
25 Jul, 2020 3 commits
- GIT_SILENT made messages (after extraction) · cdbd27b5
  Script Kiddy authored Jul 25, 2020
  
  cdbd27b5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 33e6d83d
  Script Kiddy authored Jul 25, 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"
```
  33e6d83d
- GIT_SILENT made messages (after extraction) · 37a89395
  Script Kiddy authored Jul 25, 2020
  
  37a89395
23 Jul, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 1deb4eba
  Script Kiddy authored Jul 23, 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"
```
  1deb4eba
- GIT_SILENT made messages (after extraction) · bc8a9263
  Script Kiddy authored Jul 23, 2020
  
  bc8a9263
- SVN_SILENT made messages (.desktop file) - always resolve ours · f8db03dc
  Script Kiddy authored Jul 23, 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"
```
  f8db03dc
- GIT_SILENT made messages (after extraction) · cd115954
  Script Kiddy authored Jul 23, 2020
  
  cd115954
21 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · d6ad5652
  Script Kiddy authored Jul 21, 2020
  
  d6ad5652
19 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 11047b23
  Script Kiddy authored Jul 19, 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"
```
  11047b23
- GIT_SILENT made messages (after extraction) · cbf7e1be
  Script Kiddy authored Jul 19, 2020
  
  cbf7e1be
16 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 7a563b44
  Script Kiddy authored Jul 16, 2020
  
  7a563b44
15 Jul, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · bc54d824
  Script Kiddy authored Jul 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"
```
  bc54d824
- GIT_SILENT made messages (after extraction) · 37f22bd0
  Script Kiddy authored Jul 15, 2020
  
  37f22bd0
14 Jul, 2020 2 commits
- GIT_SILENT made messages (after extraction) · fe56d740
  Script Kiddy authored Jul 14, 2020
  
  fe56d740
- GIT_SILENT made messages (after extraction) · 86a688e5
  Script Kiddy authored Jul 14, 2020
  
  86a688e5
13 Jul, 2020 3 commits
- GIT_SILENT made messages (after extraction) · 526e3a56
  Script Kiddy authored Jul 13, 2020
  
  526e3a56
- SVN_SILENT made messages (.desktop file) - always resolve ours · e9387205
  Script Kiddy authored Jul 13, 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"
```
  e9387205
- GIT_SILENT made messages (after extraction) · 57b90a44
  Script Kiddy authored Jul 13, 2020
  
  57b90a44