Franz Pletz d5189fb7ad lxc: 2.0.3 -> 2.0.4, fixes hardened build		2016-08-24 21:31:02 +02:00
..
applications	boolector: fix build with multiple outputs	2016-08-24 18:19:40 +00:00
build-support	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
data	Merge pull request #17847 from DamienCassou/cantarell-0.0.25	2016-08-23 10:51:26 +02:00
desktops	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
development	haskellPackages.git-annex: fix hash	2016-08-24 21:31:02 +02:00
games	crawl: fix build with multiple outputs	2016-08-24 19:06:00 +00:00
misc	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
os-specific	lxc: 2.0.3 -> 2.0.4, fixes hardened build	2016-08-24 21:31:02 +02:00
servers	dico: disable format hardening	2016-08-24 20:16:48 +02:00
shells	Merge branch 'master' into hardened-stdenv	2016-08-13 16:59:55 +02:00
stdenv	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
test
tools	rpm: remove hack	2016-08-24 19:26:55 +00:00
top-level	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00