Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-05-30 19:39:34 +00:00
..
R14.nix	remove erlangR14: outdated and doesn't build	2016-03-30 18:54:58 +01:00
R16.nix	treewide: Make explicit that 'dev' output of openssl is used	2016-05-19 10:02:23 +02:00
R17.nix	treewide: Make explicit that 'dev' output of openssl is used	2016-05-19 10:02:23 +02:00
R18.nix	treewide: Make explicit that 'dev' output of openssl is used	2016-05-19 10:02:23 +02:00
setup-hook.sh	erlang: add setupHook to set ERL_LIBS	2015-08-09 09:42:24 -06:00