Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size ... - there were many easy merge conflicts - cc-wrapper needed nontrivial changes Many other problems might've been created by interaction of the branches, but stdenv and a few other packages build fine now.		2015-04-18 11:22:20 +02:00
..
applications	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
build-support	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
data	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
desktops	xfce: maintenance updates of various core pkgs	2015-04-18 07:11:55 +02:00
development	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
games	Merge branch 'master' into staging	2015-04-10 07:45:38 -05:00
misc	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
os-specific	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
servers	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
shells	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
stdenv	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
test
tools	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00
top-level	Merge 'staging' into closure-size	2015-04-18 11:22:20 +02:00