1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Commit graph

929 commits

Author SHA1 Message Date
cmfwyp d6404ad48e
cabin: init at 1.005 2016-09-12 11:13:26 +02:00
Chris Martin 2b7a9a8d73 docbook 4.3: md5->sha256 2016-09-10 13:47:23 -04:00
Chris Martin df3bd28097 docbook-ebnf: md5->sha256 2016-09-10 13:46:49 -04:00
Vladimír Čunát 13668aaa01 Merge #18400: shared-mime-info: 1.5 -> 1.7 2016-09-10 11:56:22 +02:00
Joachim F 81b643edbe Merge pull request #18317 from Profpatsch/mustache-docs
mustache: init mustache at 1.0.2
2016-09-09 17:16:58 +02:00
Profpatsch 03874369a3 mustache: init mustache-spec at 1.0.2
Add a description of the mustache template system, as manpages and
html docs.
2016-09-07 21:33:29 +02:00
mimadrid 478c63d469
shared-mime-info: 1.5 -> 1.7 2016-09-07 20:49:12 +02:00
Lancelot SIX 5cbfbb1553
unifont: 9.0.01 -> 9.0.02
See http://lists.gnu.org/archive/html/info-gnu/2016-09/msg00002.html
for release announcement
2016-09-06 15:46:58 +02:00
Dmitry Kalinkin 780d9d6481 dejavu-fonts: enable on OSX 2016-09-04 16:33:27 -04:00
Robert Helgesson 04a760e31a
fira-code: 1.200 -> 1.201 2016-09-04 00:38:29 +02:00
José Romildo Malaquias 67f2a005f6
roboto-slab: init at 2016-01-11 2016-09-02 21:50:42 +02:00
José Romildo Malaquias d47753d38b
roboto-mono: init at 2016-01-11 2016-09-02 21:50:42 +02:00
Tuomas Tynkkynen 33b87da2cf nerdfonts: Don't build on Hydra
http://hydra.nixos.org/build/39383371
2016-09-01 19:49:20 +03:00
Linus Arver 511bb28689
baekmuk-ttf: switch to base32 encoded src.sha256
Closes https://github.com/NixOS/nixpkgs/pull/18166
2016-09-01 16:30:17 +02:00
Tuomas Tynkkynen 8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Eelco Dolstra e84a3524b5 man-pages: Don't have a separate docdev output
I got:

  $ nix-env -f . -iA manpages
  $ man mmap
  No manual entry for mmap

which is suboptimal for a package that "documents the Linux kernel and
C library interfaces that are employed by user-space programs"
(https://www.kernel.org/doc/man-pages/).
2016-09-01 10:57:25 +02:00
Robert Helgesson 5b61d97701
oxygenfonts: corrected version
The correct date should be Aug 24th 2016. See #17985.
2016-08-31 07:59:01 +02:00
José Romildo Malaquias cb4cd5d7f0 roboto: init at 2.134 (#18127) 2016-08-30 20:26:06 +02:00
Vladimír Čunát 475124f78e dejavu_fonts: "symlink-split" a single font file
See following commits for "why".
2016-08-29 20:21:32 +02:00
Robert Helgesson a4524b4bfb
oxygenfonts: minor cleanups
Change installation directory and some minor code simplifications.
2016-08-28 21:18:10 +02:00
Michiel Leenaars d22bb26fb9
oxygenfonts: init at 20140213 2016-08-28 21:12:29 +02:00
Tuomas Tynkkynen ad371aaef9 docbook_xml_dtd_*: Add meta.platforms 2016-08-28 18:04:09 +03:00
Markus Hauck 6879f1e57e source-code-pro: 2.010 -> 2.030 2016-08-27 10:41:36 +02:00
Damien Cassou fa3a7a723a Merge pull request #17847 from DamienCassou/cantarell-0.0.25
cantarell_fonts: 0.0.24 -> 0.0.25
2016-08-23 10:51:26 +02:00
Nikolay Amiantov edb9416228 Merge pull request #17819 from abbradar/printing-updates
Printing and PDF-related updates
2016-08-20 01:41:55 +04:00
Damien Cassou 99e7b9c4b9 cantarell_fonts: 0.0.24 -> 0.0.25 2016-08-19 13:26:50 +02:00
Nikolay Amiantov 7ce717a56c poppler_data: install pkgconfig files 2016-08-18 16:09:34 +03:00
mimadrid 60c3f3f2b9
nerdfonts: 0.7.0 -> 0.8.0, fixes #17693 2016-08-17 14:06:28 +02:00
Nikolay Amiantov 423504d0fd emojione: 1.2 -> 1.3 2016-08-14 22:37:07 +03:00
Kranium Gikos Mendoza 9d8262bd92 wireless-regdb: 2016-05-02 -> 2016-06-10 (#17706) 2016-08-14 11:45:01 +00:00
Matthew 8dd63abfd3 baekmuk-ttf: update url 2016-08-09 20:18:21 +00:00
Matthew ffb502d157 gdouros: remove broken fonts
Some of these fonts are still available but their url has moved and
their hash has been changed. If anyone still uses them, feel free to add
them back.
2016-08-09 20:11:07 +00:00
rexim b9a6ba4e8f tzdata: 2016e -> 2016f 2016-08-08 23:44:28 +06:00
cmfwyp 41b8c6d5a9
dejavu-fonts: simplify build process
Unicode data and fc-lang are only necessary to generate the status
files and coverage information, which are not used, or indeed even
generated with full-ttf.
2016-08-06 10:24:43 +02:00
cmfwyp b4c8ea9536
dejavu-fonts: 2.35 -> 2.37
Release 2.36 adds and fixes a number of glyphes, and adds the
Tex Gyre DejaVu Math font, a companion font to DejaVu Serif for
typesetting mathematics.

Release 2.37 fixes an issue with condensed typefaces.

The sources are now fetched from GitHub, since the development was
moved from SourceForge to GitHub.
2016-08-06 10:24:43 +02:00
Mounium bebc28d08b maia-icon-theme: init at 23235fa 2016-08-03 11:51:08 +02:00
cmfwyp 4ba0912a92
gentium: 1.504 -> 5.000
Gentium Plus 5.000 was released in 2014. The archive now contains
a documentation folder with information about OpenType features
supported by the font.
2016-08-03 09:22:32 +02:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Tuomas Tynkkynen 59ce911810 treewide: Some EOF-whitespace fixes 2016-08-02 21:17:44 +03:00
Profpatsch e2f6c3b4d9 hasklig: 0.4 -> 0.9 (#17257) 2016-07-25 20:18:09 +01:00
Robert Helgesson 715e01cfc2 Cleanup ucs-fonts (#16994)
* ucs-fonts: remove use of `wrapFonts`

This cleans up the `ucs-fonts` package. In particular it removes the use
of `wrapFonts`, which depends on `builderDefs`. It also renames the
package attribute from `ucsFonts` to `ucs-fonts` (with the old name
being an alias for the newer).

* wrapFonts: remove

Removed since this attribute is no longer used and depends on
`builderDefs`.
2016-07-23 02:07:44 +02:00
Robert Helgesson 5209edc8ec fira-code: 1.102 -> 1.200 2016-07-22 10:53:20 +02:00
mimadrid 02c6dd0e70
man-pages: 4.06 -> 4.07 2016-07-21 12:06:01 +02:00
Eelco Dolstra 1681718e2f google-fonts: Turn into a fixed-output derivation
Also remove the executable bit from some fonts, and don't build on
Hydra because this package is huge.
2016-07-20 11:55:46 +02:00
leenaars 4aea0ba917 liberationsansnarrow: init at 1.07.3 (#17080) 2016-07-19 12:23:09 +02:00
Tobias Geerinckx-Rice df029f6517
geolite-legacy: 2016-07-04 -> 2016-07-08 2016-07-08 20:15:02 +02:00
Neil Mayhew 7a8de0fdcf symbola: fix hash mismatch due to new upstream release
Upstream releases are made in-place, ie they update the same URL
rather than creating a new one.
2016-07-07 07:29:58 -06:00
Joachim Fasting 76af1f3d62 Merge pull request #16708 from vrthra/unifont
unifont: 8.0.01 -> 9.0.01
2016-07-05 00:02:00 +02:00
Joachim Fasting 37e912d3fa Merge pull request #16684 from leenaars/orbitron
orbitron: init at 20110526
2016-07-04 22:55:14 +02:00
Tobias Geerinckx-Rice 17de009046
geolite-legacy: 2016-06-30 -> 2016-07-04 2016-07-04 22:16:43 +02:00
Michiel Leenaars abd90135ac iosevka: minor cleanup 2016-07-04 19:47:29 +02:00
Michiel Leenaars b8fd2c9ecb orbitron: init at 20110526 2016-07-04 19:47:29 +02:00
Rahul Gopinath adad54cb91 unifont_upper: 8.0.01 -> 9.0.01 2016-07-04 10:34:21 -07:00
Rahul Gopinath 9a00f4130f unifont: 8.0.01 -> 9.0.01 2016-07-04 10:32:08 -07:00
Joachim Fasting c4ba6cbcf2 Merge pull request #16618 from leenaars/norwester
norwester-font: init at 1.2
2016-07-02 13:59:31 +02:00
Tobias Geerinckx-Rice d6871a2c7a
geolite-legacy: 2016-06-20 -> 2016-06-30 2016-06-30 15:36:42 +02:00
Michiel Leenaars 969433f229 norwester-font: init at 1.2 2016-06-30 09:44:22 +02:00
Vladimír Čunát 3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
zimbatm 4f5918cd2e Revert "stdenv: introduce baseHash() to replace stripHash()"
Introduced by mistake

This reverts commit e71a5cb878.
2016-06-25 14:25:58 +01:00
zimbatm e71a5cb878 stdenv: introduce baseHash() to replace stripHash()
stripHash uses a global variable to communicate it's computation
results, but it's not necessary. You can just pipe to stdout in a
subshell. A function mostly behaves like just another command.

baseHash() also introduces a suffix-stripping capability since it's
something the users of the function tend to use.
2016-06-25 14:20:56 +01:00
Tim Steinbach a1f3a0acda font-awesome-ttf: 4.5.0 -> 4.6.3 (#16456) 2016-06-23 16:19:50 +02:00
Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e.
2016-06-23 12:09:03 +02:00
Vladimír Čunát aa9a04883e Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096

This reverts commit c05d829598, reversing
changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
Nikolay Amiantov e6721e59c2 emojione: init at 1.2 2016-06-23 06:32:06 +03:00
Vladimír Čunát c05d829598 Merge branch 'staging' 2016-06-22 10:49:56 +02:00
Tobias Geerinckx-Rice 5dd3dbdec4
geolite-legacy: 2016-06-13 -> 2016-06-20 2016-06-20 15:58:56 +02:00
Vladimír Čunát e757404555 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1279790
2016-06-19 12:33:04 +02:00
Tobias Geerinckx-Rice 9f996d6406
tzdata: 2016d -> 2016e 2016-06-14 18:27:57 +02:00
Tobias Geerinckx-Rice 156a14d153
geolite-legacy: 2016-06-08 -> 2016-06-13 2016-06-14 18:27:56 +02:00
Robert Helgesson 96fc1e19b8 cacert: remove dependency on LWP
The `mk-ca-bundle.pl` script manages quite well using only curl but
fails without LWP being present due to a `use` statement. This removes
the Perl import of the LWP library and adds curl as a build input.
2016-06-13 22:18:59 +02:00
José Romildo Malaquias d76e2f24c2 numix-icon-theme-circle: 2016-05-25 -> 2016-06-10 2016-06-13 10:03:24 +02:00
José Romildo Malaquias 8edc102336 numix-icon-theme: 2016-05-18 -> 2016-06-10 2016-06-13 10:03:24 +02:00
José Romildo Malaquias 25d37fc4eb paper-icon-theme: 2016-05-25 -> 2016-06-08 2016-06-13 09:56:31 +02:00
José Romildo Malaquias 0072cb8ff1 faba-mono-icons: init at 2016-04-30
Closes #16109.
2016-06-13 09:40:51 +02:00
José Romildo Malaquias fa447287b0 arc-icon-theme: init at 2016-06-06 2016-06-13 09:40:44 +02:00
José Romildo Malaquias 4e44a330cb moka-icon-theme: init at 2016-06-07 2016-06-13 09:40:43 +02:00
José Romildo Malaquias c33cf02337 faba-icon-theme: init at 2016-06-02 2016-06-13 09:40:43 +02:00
zimbatm 711456c632 Merge pull request #16187 from Profpatsch/bgnet
bgnet: init at 3.0.21
2016-06-12 22:08:14 +01:00
Profpatsch 0da4bb869e bgnet: init at 3.0.21 2016-06-12 21:28:40 +02:00
Nikolay Amiantov 9a1d6fe701 fontforge: 20150824 -> 20160404 2016-06-11 02:43:44 +03:00
Christian Lask e0e9df7c8d mononoki: init at 1.2 2016-06-10 12:19:17 +02:00
Vladimír Čunát bd458e56b6 Merge #14356: docbook updates 2016-06-09 13:11:53 +02:00
Tobias Geerinckx-Rice 1201cc569c
geolite-legacy: 2016-06-06 -> 2016-06-08 2016-06-08 19:53:48 +02:00
Nikolay Amiantov bd1b236f7c fix 'licenses' -> 'license' in several places 2016-06-07 04:57:21 +03:00
Nikolay Amiantov ffb1e8506b corefonts: add meta and mark as unfree
See e.g. https://sourceforge.net/p/corefonts/bugs/6/
2016-06-07 04:52:58 +03:00
Tobias Geerinckx-Rice 894b011381
geolite-legacy: 2016-05-31 -> 2016-06-06 2016-06-06 16:18:53 +02:00
Robert Helgesson 5474d37d58 libertine: set platforms field
Also make the `fontforge` build input a native build input.
2016-06-06 01:01:56 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Tobias Geerinckx-Rice fb1d4dfabd
geolite-legacy: 2016-05-23 -> 2016-05-31 2016-05-31 15:17:47 +02:00
Joachim Fasting 69091bae84 Merge pull request #15741 from romildo/fix.themes
Numix and Paper themes: fix installation dir and update revision
2016-05-28 22:30:55 +02:00
José Romildo Malaquias 864e3ff38e paper-icon-theme: fix installation directory 2016-05-26 23:58:52 -03:00
José Romildo Malaquias 9a18cef082 paper-icon-theme: 2016-05-21 -> 2016-05-25 2016-05-26 23:56:42 -03:00
José Romildo Malaquias 267f6f4e97 numix-icon-theme-circle: 2016-05-18 -> 2016-05-25 2016-05-26 23:53:23 -03:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Tobias Geerinckx-Rice 03f76c136d
geolite-legacy: 2016-05-16 -> 2016-05-23 2016-05-23 14:36:30 +02:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
José Romildo Malaquias cb67a0f150 paper-icon-theme: init at 2016-05-21 2016-05-22 10:41:15 -03:00
José Romildo Malaquias 065c33ebc4 numix-icon-theme-circle: 20160121-e7008b488edfe37379ba9c4b8d5245dfd6125fc3 -> 2016-05-18 2016-05-20 15:10:37 -03:00
José Romildo Malaquias eb71f6d947 numix-icon-theme: 20160120-a704451830d343670721cbf1391df18611d61901 -> 2016-05-18 2016-05-20 14:58:44 -03:00
Tuomas Tynkkynen 5bb34f241e treewide: Make explicit that 'dev' output of gtk is used 2016-05-19 10:00:38 +02:00
Rok Garbas 44b6ba1872 nerdfonts: moved to correct location 2016-05-17 01:56:35 +02:00
Tobias Geerinckx-Rice a13b69bb61
geolite-legacy: 2016-05-09 -> 2016-05-16 2016-05-16 20:27:31 +02:00
Robert Helgesson 2a6cbbfaec fantasque-sans-mono: 1.6.5 -> 1.7.1 2016-05-15 19:45:39 +02:00
aszlig b9ffa19db8
dosemu-fonts: Fix and simplify build
Regression introduced by 9820cb1bf2.

The commit only sets dontBuild but the build for the DOSEmu fonts had a
dummy configurePhase as well.

So rather than just reinserting a dummy configurePhase again, let's just
use buildCommand and put it out in one go, which is more suitable for
such a simple package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-15 06:03:56 +02:00
Rok Garbas 266c94ccfa nerdfonts: init at 0.7.0 2016-05-15 04:31:47 +02:00
Vladimír Čunát 3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Tobias Geerinckx-Rice 5ac6c666a1
man-pages: 4.05 -> 4.06 2016-05-12 05:17:33 +02:00
Vladimír Čunát 6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Franz Pletz 4e61adbeca mobile-broadband-provider-info: 20120614 -> 20151214 2016-05-12 01:50:04 +02:00
Nikolay Amiantov 43634d47e4 xits-math: init at 1.108 2016-05-11 06:26:15 +03:00
Tobias Geerinckx-Rice baac4e88e1
geolite-legacy: 2016-05-03 -> 2016-05-09 2016-05-10 01:22:53 +02:00
Eelco Dolstra 7ce5d43c63 Fix some URLs that lacked a URI scheme 2016-05-09 19:35:05 +02:00
Vladimír Čunát 65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Robert Helgesson 05a98bae91 pecita: 5.2 -> 5.3 2016-05-08 13:24:04 +02:00
Vladimír Čunát 1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
Robin Gloster 9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tobias Geerinckx-Rice db3ee01ab6
geolite-legacy: 2016-05-02 -> 2016-05-03 2016-05-03 23:42:08 +02:00
Tobias Geerinckx-Rice 078f14e058
hicolor_icon_theme: 0.14 -> 0.15 2016-05-03 04:31:20 +02:00
Tobias Geerinckx-Rice 69ef7566a8
wireless-regdb: 2016-02-08 -> 2016-05-02 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice 6cff7111d0
geolite-legacy: 2016-04-29 -> 2016-05-02 2016-05-02 13:53:32 +02:00
Tobias Geerinckx-Rice fd94ec4984
geolite-legacy: fix 2016-04-29 16:29:54 +02:00
Tobias Geerinckx-Rice f95ba43e8b
geolite-legacy: 2016-04-28 -> 2016-04-29 2016-04-29 15:37:23 +02:00
Tobias Geerinckx-Rice 0798ebbfc5
geolite-legacy: 2016-04-25 -> 2016-04-28 2016-04-28 23:48:36 +02:00
Tobias Geerinckx-Rice d71aabe00d
hack-font: 2.019 -> 2.020
Changes: https://github.com/chrissimpkins/Hack/blob/master/CHANGELOG.md
2016-04-27 16:55:36 +02:00
Tobias Geerinckx-Rice 0f479e3016
geolite-legacy: 2016-04-19 -> 2016-04-25 2016-04-25 13:32:05 +02:00
Nikolay Amiantov 6554997eaa zeal: move to qmakeHook
This reverts commit 9cfc8d94bb.
2016-04-20 18:55:50 +03:00
Vladimír Čunát 57474b7d4a Merge branch 'master' into staging
Compare to Hydra nixpkgs job 1260021.
2016-04-20 16:49:52 +02:00
Damien Cassou 972fd22fe4 cantarell-fonts: 0.0.17 -> 0.0.24 2016-04-20 16:46:00 +02:00
Tobias Geerinckx-Rice de56b74775
geolite-legacy 2016-02-29 -> 2016-04-19
Should fix the bug of Kansas farmers getting SWATted.

http://fusion.net/story/287592/internet-mapping-glitch-kansas-farm/
2016-04-19 12:30:12 +02:00
Tobias Geerinckx-Rice 5a5012a7cd
tzdata: 2016c -> 2016d 2016-04-18 19:12:34 +02:00
José Romildo Malaquias d94a8d67bd helvetica-neue-lt-std: init at 2013.06.07
fix
2016-04-16 21:42:01 +02:00
aszlig 9cfc8d94bb
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of zeal override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of zeal and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Myrl Hex c73d14a39f profont: init 2016-04-14 14:27:25 +03:00
Vladimír Čunát 056b5a1a5f tzdata: fixup after merging master
also rename lib output to dev - it contains a header and a static lib.
2016-04-02 16:26:32 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
José Romildo Malaquias fb893a8ad2 docbook-xsl: 1.78.1 -> 1.79.1 2016-04-01 03:19:38 +02:00
Tobias Geerinckx-Rice e0c53be991 tzdata: 2016b -> 2016c 2016-03-31 02:53:31 +02:00
Nikolay Amiantov e65b0b851b noto-fonts-emoji: add uncommited fix 2016-03-29 21:05:32 +03:00
Nikolay Amiantov f4fa3565b8 noto-fonts-emoji: 2015-08-17 -> 2016-03-17 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 08db1b19a2 noto-fonts-cjk: cleanup 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 9c8f810f83 noto-fonts: 2015-09-08 -> 2016-03-29 2016-03-29 21:02:15 +03:00
Eelco Dolstra c22657b5f8 mplus: Don't start version with a letter 2016-03-24 13:24:29 +01:00
Arseniy Seroka fba952024f tzdata: 2016a -> 2016b 2016-03-19 00:23:45 +03:00
Tobias Geerinckx-Rice 1c9d5306fb tzdata: 2015g -> 2016a 2016-03-16 21:10:20 +01:00
Tobias Geerinckx-Rice 7a1f76bc5f man-pages: 4.04 -> 4.05 2016-03-16 21:10:20 +01:00
Graham Christensen 1b556f9f46 docbook: convert md5 to sha256 2016-03-11 15:54:55 -06:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Sergiu Ivanov 81f0eaa61f montserrat: init at 1.0 2016-03-07 19:42:26 +01:00
vbgl 7f422cf872 Merge pull request #13621 from DamienCassou/add-gentium-book-basic
gentium-book-basic: init at 1.102
2016-03-02 19:20:58 +01:00