From: Emma Marichal <bonjour@emmamarichal.fr>
Date: Fri, 18 Oct 2024 14:17:36 +0000 (+0200)
Subject: Merge branch 'gftools_packager_ofl_spectralsc' of github.com:emmamarichal/fonts into... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59ec2a71d73276d9610be3cc5b3b3fac82cb9c7f;p=thirdparty%2Fgoogle%2Ffonts.git

Merge branch 'gftools_packager_ofl_spectralsc' of github.com:emmamarichal/fonts into gftools_packager_ofl_spectralsc

# 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
---

59ec2a71d73276d9610be3cc5b3b3fac82cb9c7f
diff --cc ofl/spectralsc/METADATA.pb
index d3f598e639,ae160b28ee..718290c9de
--- a/ofl/spectralsc/METADATA.pb
+++ b/ofl/spectralsc/METADATA.pb
@@@ -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"
  }