Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
darwin	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00