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
..
3.3.nix	gnutls33: 3.3.17 -> 3.3.18	2015-09-13 19:51:52 -07:00
3.4.nix	gnutls: 3.4.5 -> 3.4.6	2015-10-21 21:48:57 -07:00
generic.nix	Merge master into closure-size	2016-03-08 09:58:19 +01:00