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
..
common.nix	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
default.nix	idea.idea-{community,ultimate}: 15.0.4 -> 2016.1	2016-03-18 18:26:23 +01:00