tree be2396260e3d7b5b0f69fdddfbd63129e78d1ce8
parent f9efa6d5b149b201c2fd32113c3f9ad1f98b6a6e
parent 6f92b8334629cccee220b503faae728e550e4bae
author David Matějček <dmatej@seznam.cz> 1646411098 +0100
committer David Matějček <dmatej@seznam.cz> 1646411098 +0100

Merge remote-tracking branch 'eclipse/6.x' into merge-to-master

# Conflicts: nothing much complicated