Vladimír Čunát 09af15654f Merge master into closure-size ... The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.		2016-03-08 09:58:19 +01: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.3 -> 15.0.4	2016-02-25 17:48:07 +01:00