Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
documentation	man-pages: 4.14 -> 4.15	2018-02-26 22:22:35 -08:00
fonts	iosevka: 1.14.0 -> 1.14.1	2018-03-08 20:05:47 -08:00
icons	numix-icon-theme-square: build GTK icon cache	2018-03-04 07:49:06 -03:00
misc	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
sgml+xml	docbook-xsl-ns: "revert" after parent commit	2018-01-30 19:49:44 +01:00
soundfonts/fluid