Franz Pletz b4cc9bd63a Merge remote-tracking branch 'origin/master' into hardened-stdenv ... Fixes #17801 and #17802.		2016-08-17 19:43:43 +02:00
..
darwin	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
gnu	Fix lots of fetchgit hashes (fallout from #15469)	2016-06-03 17:17:08 +03:00
linux	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-17 19:43:43 +02:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00