[pango: 5/5] Merge branch 'matthiasc/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit a31741faf6e59737c561574c3a7679ea185f4154
Merge: 0eb9ca5a 8d6d0230
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Nov 20 01:48:52 2021 +0000

    Merge branch 'matthiasc/for-main' into 'main'
    
    Don't replace | with hyphens
    
    Closes #630
    
    See merge request GNOME/pango!516

 .gitlab-ci/list-msys2.sh        |  2 +-
 .gitlab-ci/render-msys2.sh      |  2 +-
 meson.build                     | 25 +++++++++++++++++++++++++
 pango/break.c                   |  3 +--
 tests/breaks/sixteen.expected   |  2 +-
 tests/layouts/valid-17.expected |  2 +-
 6 files changed, 30 insertions(+), 6 deletions(-)
---