Vladimír Čunát 8559b6db82 Merge branch 'master' into staging ... A couple thousand rebuilds from master.		2017-11-11 09:25:07 +01:00
..
applications	Merge branch 'master' into staging	2017-11-11 09:25:07 +01:00
build-support	Merge pull request #31356 from FRidh/fetchgitPrivate	2017-11-10 10:57:50 +01:00
common-updater
data	Merge branch 'master' into staging	2017-11-11 09:25:07 +01:00
desktops
development	Merge branch 'master' into staging	2017-11-11 09:25:07 +01:00
games	Merge pull request #31480 from DIzFer/steam-borderlands-fix	2017-11-10 18:05:54 +00:00
misc	Merge pull request #31390 from Ma27/fix-buildphase-expressions	2017-11-11 00:04:37 +00:00
os-specific	Merge branch 'master' into staging	2017-11-11 09:25:07 +01:00
servers	Merge pull request #31390 from Ma27/fix-buildphase-expressions	2017-11-11 00:04:37 +00:00
shells	Merge pull request #31390 from Ma27/fix-buildphase-expressions	2017-11-11 00:04:37 +00:00
stdenv
test
tools	Merge branch 'master' into staging	2017-11-11 09:25:07 +01:00
top-level	python.pkgs.reportlab: move expression	2017-11-11 09:15:21 +01:00