Franz Pletz e8d9e31a08 valum: 0.2.0 -> 0.2.16, fixes hardened build		2016-08-24 20:18:46 +02:00
..
applications	Merge branch 'master' into staging	2016-08-24 11:57:44 +01: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	valum: 0.2.0 -> 0.2.16, fixes hardened build	2016-08-24 20:18:46 +02:00
games	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
misc	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
os-specific	otpw: disable stackprotector hardening	2016-08-24 17:19:43 +00: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	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00
top-level	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00