Matthew Justin Bauer 7a516cd0c3 Merge branch 'master' into feat/nsd/dnssec		2018-04-21 14:48:30 -05:00
..
applications	Merge pull request #38664 from bcdarwin/minc_ecosystem	2018-04-21 20:30:37 +01:00
build-support	Merge pull request #39003 from P-E-Meunier/carnix-0.7	2018-04-19 12:09:55 -05:00
common-updater
data	Merge pull request #39204 from r-ryantm/auto-update/osinfo-db	2018-04-21 18:26:32 +01:00
desktops	Merge pull request #39201 from r-ryantm/auto-update/pluma	2018-04-21 19:03:48 +01:00
development	Merge pull request #39095 from moaxcp/master	2018-04-21 19:43:23 +00:00
games	dwarf-fortress: 0.44.05 -> 0.44.09	2018-04-21 14:57:44 +02:00
misc	Merge pull request #39252 from r-ryantm/auto-update/cups-filters	2018-04-21 12:44:30 +01:00
os-specific	Merge pull request #39122 from sorki/zfs_exportfs	2018-04-21 19:32:05 +01:00
servers	Merge branch 'master' into feat/nsd/dnssec	2018-04-21 14:48:30 -05:00
shells	pkgs/shells: move extensions to subdirs	2018-04-17 14:47:32 -05:00
stdenv	Merge pull request #39172 from obsidiansystems/ios-cross	2018-04-19 17:00:05 -04:00
test
tools	Merge pull request #39198 from r-ryantm/auto-update/playerctl	2018-04-21 19:02:20 +01:00
top-level	Merge branch 'master' into feat/nsd/dnssec	2018-04-21 14:48:30 -05:00