William A. Kennington III 3fcbd5a829 Merge branch 'master.upstream' into staging.upstream		2015-09-20 14:54:53 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -07:00
data	noto-fonts: init at git-2015-09-08	2015-09-19 16:54:16 -06:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -07:00
development	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -07:00
games	hackage-packages.nix: switch our default package set to Stackage Nightly	2015-09-19 08:20:40 +02:00
misc	mgba: use Qt 5.4	2015-09-19 10:01:25 -05:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -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-20 14:54:53 -07:00
top-level	Merge branch 'master.upstream' into staging.upstream	2015-09-20 14:54:53 -07:00