- 18 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 16 Jan, 2021 1 commit
-
-
- 02 Jan, 2021 1 commit
-
-
Christoph Feck authored
(cherry picked from commit dbbf87a6)
-
- 02 Dec, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 8fda66ec)
-
- 13 Nov, 2020 1 commit
-
-
Script Kiddy authored
-
- 08 Nov, 2020 1 commit
-
-
Albert Astals Cid authored
-
- 31 Oct, 2020 2 commits
-
-
Christoph Feck authored
(cherry picked from commit 9e3f8e79)
-
Nicolas Fella authored
In one case by renaming a slot so it isn't overloaded any more. In other cases by using QOverload
-
- 22 Oct, 2020 1 commit
-
-
Laurent Montel authored
-
- 03 Oct, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit d018f0bc)
-
- 16 Sep, 2020 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 31 Aug, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 57b8d085)
-
- 05 Aug, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 911c8190)
-
- 11 Jul, 2020 1 commit
-
-
Albert Astals Cid authored
-
- 04 Jul, 2020 2 commits
- 03 Jul, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 93485010)
-
- 18 Jun, 2020 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 17 Jun, 2020 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
-
- 08 Jun, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 750fe890)
-
- 21 May, 2020 1 commit
-
-
Yuri Chornoivan authored
-
- 11 May, 2020 1 commit
-
-
Christoph Feck authored
(cherry picked from commit 69142383)
-
- 19 Apr, 2020 2 commits
-
-
Friedrich W. H. Kossebau authored
-
Friedrich W. H. Kossebau authored
GIT_SILENT
-
- 15 Apr, 2020 3 commits
-
-
Christoph Feck authored
(cherry picked from commit 124ff808)
-
Christoph Feck authored
-
Christoph Feck authored
-
- 13 Apr, 2020 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
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"
-
- 09 Apr, 2020 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
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"
-
- 28 Mar, 2020 1 commit
-
-
Christoph Feck authored
-
- 27 Mar, 2020 1 commit
-
-
Script Kiddy authored
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"
-
- 22 Mar, 2020 2 commits
-
-
Script Kiddy authored
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"
-
Script Kiddy authored
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"
-
- 15 Mar, 2020 2 commits
-
-
Albert Astals Cid authored
-
Albert Astals Cid authored
-