GitLab

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"

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"

[T12843][GSoC 2020] Add new entry type - HorizontalRuleEntry. This entry is a horizontal rule with support of changing width, color and style of the rule.
Also, some minor refactoring for Command Entry background color menu.

Closes T12843

[T12843][GSoC 2020] Add new global entries actions: collapsing all Results, uncollapsing all results, remove all results

This reverts commit c3b3f516 as it
pushed quite a few changes and broke the build.

BUG: 420959
FIXED-IN: 20.07.70

[Octave] Change graphics toolkit only if currect toolkit is "fltk". This is needed for preventing problem with modern octave versions (5.0.0+), some of which have "qt" toolkit as default.

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"

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"