Skip to content

Commit 4b4effa

Browse files
authored
Merge pull request matplotlib#31563 from tacaswell/lic/drop_carlogo
LIC: remove carlogo license
2 parents ea362ab + 555b572 commit 4b4effa

3 files changed

Lines changed: 1 addition & 53 deletions

File tree

LICENSE/LICENSE_CARLOGO

Lines changed: 0 additions & 45 deletions
This file was deleted.

doc/project/license.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,6 @@ Fonts
151151
.. literalinclude:: ../../LICENSE/LICENSE_BAKOMA
152152
:language: none
153153

154-
.. dropdown:: Carlogo
155-
:class-container: sdd
156-
157-
.. literalinclude:: ../../LICENSE/LICENSE_CARLOGO
158-
:language: none
159-
160154
.. dropdown:: Courier 10
161155
:class-container: sdd
162156

meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ project(
77
'-m', 'setuptools_scm', check: true).stdout().strip(),
88
# qt_editor backend is MIT
99
# ResizeObserver at end of lib/matplotlib/backends/web_backend/js/mpl.js is CC0
10-
# Carlogo, STIX, Computer Modern, and Last Resort are OFL
10+
# STIX, Computer Modern, and Last Resort are OFL
1111
# DejaVu is Bitstream Vera and Public Domain
1212
license: 'PSF-2.0 AND MIT AND CC0-1.0 AND OFL-1.1 AND Bitstream-Vera AND Public-Domain',
1313
license_files: [
1414
'LICENSE/LICENSE',
1515
'extern/agg24-svn/src/copying',
1616
'LICENSE/LICENSE_AMSFONTS',
1717
'LICENSE/LICENSE_BAKOMA',
18-
'LICENSE/LICENSE_CARLOGO',
1918
'LICENSE/LICENSE_COLORBREWER',
2019
'LICENSE/LICENSE_COURIERTEN',
2120
'LICENSE/LICENSE_FREETYPE',

0 commit comments

Comments
 (0)