Luca Bruno 83221f3886 Merge branch 'master' into staging ... Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing		2014-11-08 15:56:40 +01:00
..
1.nix	gnupg: Add gnupg 2.1 as default	2014-11-06 11:44:12 -08:00
1compat.nix	gnupg: Add gnupg 2.1 as default	2014-11-06 11:44:12 -08:00
20.nix	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
21.nix	gnupg: Add gnupg 2.1 as default	2014-11-06 11:44:12 -08:00
clang.patch	suitable clang stdenv	2014-09-09 13:54:24 -07:00