John Ericson 5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging		2018-05-18 17:48:37 -04:00
..
7.0.nix	imagemagick7: 7.0.7-29 -> 7.0.7-32 (#40669)	2018-05-18 17:21:25 +02:00
default.nix	tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part)	2018-04-25 04:18:46 +00:00
imagetragick.patch	imagemagick: 6.9.3-9 -> 6.9.5-2 (#16958)	2016-07-18 06:12:17 +02:00