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
..
applications	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
build-support	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
data	hasklig: new font	2014-11-07 01:14:48 +00:00
desktops	Merge recent master into staging	2014-11-05 15:00:44 +01:00
development	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
games	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
misc	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
os-specific	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
servers	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	Fix stdenv allowedRequisites check	2014-11-06 15:33:36 +01:00
test
tools	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00
top-level	Merge branch 'master' into staging	2014-11-08 15:56:40 +01:00