Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD		2018-02-26 10:50:18 +01:00
..
3.5.10.nix	gnutls: use mirror://gnupg (fix #32147)	2017-11-28 20:43:56 +01:00
3.6.nix	gnutls: 3.6.1 -> 3.6.2	2018-02-22 08:24:02 +02:00
generic.nix	tree-wide: autorename gnome packages to use dashes	2018-02-25 17:41:16 +01:00