William A. Kennington III 9f3c0d9967 Merge branch 'master.upstream' into staging.post-15.06		2015-09-19 14:40:01 -07:00
..
applications	Merge branch 'master.upstream' into staging.post-15.06	2015-09-19 14:40:01 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-09-18 17:16:27 -07:00
data	source-han-sans: 1.001 -> 1.004	2015-09-19 09:57:06 +09:00
desktops	boost: Reduce the number of supported versions	2015-09-17 15:40:32 -07:00
development	Merge branch 'master.upstream' into staging.post-15.06	2015-09-19 14:40:01 -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 'staging.upstream' into staging.post-15.06	2015-09-19 14:39:57 -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	Merge branch 'staging.upstream' into staging.post-15.06	2015-09-19 14:39:57 -07:00
test
tools	Merge branch 'master.upstream' into staging.post-15.06	2015-09-19 14:40:01 -07:00
top-level	Merge branch 'master.upstream' into staging.post-15.06	2015-09-19 14:40:01 -07:00