Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-03-14 17:37:20 +01:00
commit 8c72ed923d
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
227 changed files with 32566 additions and 5104 deletions

View file

@ -290,7 +290,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
; The exact license is more X11-style than BSD-style.
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))
(home-page "http://www.freedesktop.org/wiki/Software/fontconfig")))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))
(define-public t1lib
(package