]> git.ipfire.org Git - thirdparty/google/fonts.git/commitdiff
Merge branch 'gftools_packager_ofl_spectralsc' of github.com:emmamarichal/fonts into...
authorEmma Marichal <bonjour@emmamarichal.fr>
Fri, 18 Oct 2024 14:17:36 +0000 (16:17 +0200)
committerEmma Marichal <bonjour@emmamarichal.fr>
Fri, 18 Oct 2024 14:17:36 +0000 (16:17 +0200)
# Conflicts:
# ofl/spectralsc/METADATA.pb
# ofl/spectralsc/OFL.txt
# ofl/spectralsc/SpectralSC-Bold.ttf
# ofl/spectralsc/SpectralSC-BoldItalic.ttf
# ofl/spectralsc/SpectralSC-ExtraBold.ttf
# ofl/spectralsc/SpectralSC-ExtraBoldItalic.ttf
# ofl/spectralsc/SpectralSC-ExtraLight.ttf
# ofl/spectralsc/SpectralSC-ExtraLightItalic.ttf
# ofl/spectralsc/SpectralSC-Italic.ttf
# ofl/spectralsc/SpectralSC-Light.ttf
# ofl/spectralsc/SpectralSC-LightItalic.ttf
# ofl/spectralsc/SpectralSC-Medium.ttf
# ofl/spectralsc/SpectralSC-MediumItalic.ttf
# ofl/spectralsc/SpectralSC-Regular.ttf
# ofl/spectralsc/SpectralSC-SemiBold.ttf
# ofl/spectralsc/SpectralSC-SemiBoldItalic.ttf

1  2 
ofl/spectralsc/METADATA.pb

index d3f598e6395973e9c5bf4645d91a9f565ed98e55,ae160b28eea2c6fa586aaf6239a3dc0f55cf2043..718290c9de504d3e310088dae107070f587dae02
@@@ -195,8 -195,8 +195,8 @@@ source 
      dest_file: "SpectralSC-ExtraBoldItalic.ttf"
    }
    files {
--    source_file: "ofl.txt"
--    dest_file: "ofl.txt"
++    source_file: "OFL.txt"
++    dest_file: "OFL.txt"
    }
    branch: "master"
  }