William A. Kennington III 6e09223627 Merge branch 'master.upstream' into staging.upstream		2015-09-18 17:16:27 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
data	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
desktops	boost: Reduce the number of supported versions	2015-09-17 15:40:32 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
games	all-packages: Use callPackage where possible	2015-09-14 22:27:19 -06:00
misc	hplip & plugin: 3.15.6 -> 3.15.9	2015-09-18 02:04:05 +02:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
shells	Merge commit 'a6f6c0e' into master.upstream	2015-09-15 12:16:49 -07:00
stdenv	Enable separate debug info	2015-09-17 15:56:33 +02:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00