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
..
applications-15.12	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
frameworks-5.19	kde5: fix merge conflicts from master	2016-03-09 06:49:44 -06:00
plasma-5.5	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00