GitLab

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)

Glen Ditchfield authored Dec 09, 2020 and Glen Ditchfield committed Dec 12, 2020

If an event is in a non-local time zone, and extends past midnight in the
local time zone but not in its own time zone, the agenda view miscalculates
the number of day columns that it should display the event in.

BUG: 429007

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"

Christophe Giboudeaux authored Aug 17, 2020 and Volker Krause committed Sep 04, 2020

Relicensing allowed: lgplv2+ +eV gplv23 lgplv23 gplv2+

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"