- 24 Jan, 2021 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"
-
- 17 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 15 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 14 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 13 Jan, 2021 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
-
- 12 Jan, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 10 Jan, 2021 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 08 Jan, 2021 7 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
(cherry picked from commit bf89efae)
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
BUG: 431126 (cherry picked from commit e9f67828)
-
Laurent Montel authored
BUG: 431126
-
Laurent Montel authored
-
- 05 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 04 Jan, 2021 1 commit
-
-
Laurent Montel authored
GIT_SILENT: use new cmake-3.19.0 feature. cmake --preset=dev or other it will provide correct cmake settings
-
- 02 Jan, 2021 2 commits
-
-
Christoph Feck authored
-
Christoph Feck authored
(cherry picked from commit eabb9614)
-
- 01 Jan, 2021 1 commit
-
-
Laurent Montel authored
-
- 30 Dec, 2020 3 commits
-
-
Laurent Montel authored
-
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"
-
- 27 Dec, 2020 2 commits
-
-
Laurent Montel authored
but not in CI wierd This reverts commit 11bb1e0f.
-
Laurent Montel authored
-
- 26 Dec, 2020 2 commits
-
-
Luca Beltrame authored
GIT_SILENT
-
Luca Beltrame authored
-
- 21 Dec, 2020 1 commit
-
-
Laurent Montel authored
-
- 19 Dec, 2020 1 commit
-
-
Laurent Montel authored
-
- 18 Dec, 2020 1 commit
-
-
Laurent Montel authored
-
- 15 Dec, 2020 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
Allow to use UNITY build see https://cmake.org/cmake/help/latest/prop_tgt/UNITY_BUILD.html (Reduce compile time. Need cmake 3.16.0)
-
- 13 Dec, 2020 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 12 Dec, 2020 4 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
-
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
-