William A. Kennington III 8f45d18a71 Merge branch 'master.upstream' into staging.upstream		2015-11-13 15:54:10 -08:00
..
applications	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
build-support	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
data	Merge branch 'master.upstream' into staging.upstream	2015-11-05 10:07:28 -08:00
desktops	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
development	Merge branch 'master.upstream' into staging.upstream	2015-11-13 15:54:10 -08:00
games	macopix: init at 1.7.4	2015-11-12 20:54:48 +00:00
misc	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-11-13 15:54:10 -08:00
servers	Merge commit 'cb21b77' into master.upstream	2015-11-13 15:53:10 -08:00
shells	fish: fix use hostname from the store instead of from the environment	2015-11-06 09:55:55 +01:00
stdenv	Don't fail if env-vars cannot be written to	2015-11-04 16:32:59 +01:00
test
tools	Merge branch 'master.upstream' into staging.upstream	2015-11-13 15:54:10 -08:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-11-13 15:54:10 -08:00