William A. Kennington III 9d6555dc0a Merge branch 'master.upstream' into staging.upstream		2015-06-06 12:04:42 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00
build-support	cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out	2015-06-05 13:00:52 -07:00
data	cacert: store ca-bundle.crt in $out/etc/ssl/certs instead of $out	2015-06-05 13:00:52 -07:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00
games	fix: add missing versions	2015-06-04 23:34:14 +03:00
misc	Merge pull request #8178 from jagajaga/fix/versions	2015-06-06 00:22:10 +03:00
os-specific	Revert "pam: Factor out dependencies"	2015-06-06 12:02:38 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00
shells	cygwin: bash updated to 4.3 for cygwin platform	2015-05-29 10:18:06 +02:00
stdenv	Revert "curl: Modernize build"	2015-06-04 14:54:52 +02:00
test
tools	f2fs-tools: 1.3.0 -> 1.4.1	2015-06-06 15:22:02 +03:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-06-06 12:04:42 -07:00