Matthew Bauer 2c1d3a9a82 Merge remote-tracking branch 'upstream/master' into staging		2018-11-18 19:02:09 -06:00
..
applications	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
build-support	Merge staging-next into staging	2018-11-18 10:41:34 +01:00
common-updater	common-updater, firefox: fix updater for firefox	2018-11-16 23:04:54 +09:00
data	terminus_font_ttf: 4.40.1 -> 4.46.0	2018-11-18 21:39:42 +01:00
desktops	Merge pull request #46020 from jtojnar/meson-0.47	2018-11-18 22:17:49 +01:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
games	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
misc	Merge staging-next into staging	2018-11-18 10:41:34 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
servers	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
shells	dash: add licenses	2018-11-15 00:13:52 +01:00
stdenv	Revert "patch-shebangs: use --build for auto patch shebangs"	2018-11-14 23:37:31 +01:00
test	pkgs/test/nixos-functions: Add inline doc	2018-11-13 10:47:17 +01:00
tools	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-11-18 19:02:09 -06:00