From: Viviana Monsalve Date: Thu, 4 Jul 2024 16:10:12 +0000 (-0500) Subject: Merge commit '93362e2' into axis-reg-pull-v0410 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7923%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit '93362e2' into axis-reg-pull-v0410 --- 7070b6911181951b3c42396bd378aa623a461e0b diff --cc axisregistry/Lib/axisregistry/data/element_expansion.textproto index 0000000000,ba2c08a152..ba2c08a152 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/element_expansion.textproto +++ b/axisregistry/Lib/axisregistry/data/element_expansion.textproto diff --cc axisregistry/Lib/axisregistry/data/size_paint_1.textproto index 0000000000,86ef79e50e..86ef79e50e mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/size_paint_1.textproto +++ b/axisregistry/Lib/axisregistry/data/size_paint_1.textproto diff --cc axisregistry/Lib/axisregistry/data/size_paint_2.textproto index 0000000000,c6d6d2b2f9..c6d6d2b2f9 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/size_paint_2.textproto +++ b/axisregistry/Lib/axisregistry/data/size_paint_2.textproto diff --cc axisregistry/Lib/axisregistry/data/x_element_alignment.textproto index 0000000000,8e8446af57..8e8446af57 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/x_element_alignment.textproto +++ b/axisregistry/Lib/axisregistry/data/x_element_alignment.textproto diff --cc axisregistry/Lib/axisregistry/data/x_position_paint_1.textproto index 0000000000,288e7474b0..288e7474b0 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/x_position_paint_1.textproto +++ b/axisregistry/Lib/axisregistry/data/x_position_paint_1.textproto diff --cc axisregistry/Lib/axisregistry/data/x_position_paint_2.textproto index 0000000000,4008b01bdf..4008b01bdf mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/x_position_paint_2.textproto +++ b/axisregistry/Lib/axisregistry/data/x_position_paint_2.textproto diff --cc axisregistry/Lib/axisregistry/data/y_position_paint_1.textproto index 0000000000,7d810cc5e7..7d810cc5e7 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/y_position_paint_1.textproto +++ b/axisregistry/Lib/axisregistry/data/y_position_paint_1.textproto diff --cc axisregistry/Lib/axisregistry/data/y_position_paint_2.textproto index 0000000000,574f431fae..574f431fae mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/y_position_paint_2.textproto +++ b/axisregistry/Lib/axisregistry/data/y_position_paint_2.textproto