Frederik Rietdijk d9fa74ba78 Merge master into staging		2018-08-09 18:28:15 +02:00
..
applications	Merge master into staging	2018-08-09 18:28:15 +02:00
build-support	bintools-wrapper: propagated-build-inputs -> propagated-user-env-packages	2018-08-09 13:07:14 +02:00
common-updater
data	Merge master into staging	2018-08-09 18:28:15 +02:00
desktops	Merge master into staging	2018-08-09 18:28:15 +02:00
development	Merge master into staging	2018-08-09 18:28:15 +02:00
games	Merge master into staging	2018-08-09 18:28:15 +02:00
misc	Merge master into staging	2018-08-09 18:28:15 +02:00
os-specific	Merge master into staging	2018-08-09 18:28:15 +02:00
servers	Merge master into staging	2018-08-09 18:28:15 +02:00
shells	antibody: 3.5.1 -> 3.6.1 (#44481)	2018-08-05 21:00:55 +02:00
stdenv	Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"	2018-08-09 12:57:38 +02:00
test
tools	Merge master into staging	2018-08-09 18:28:15 +02:00
top-level	Merge master into staging	2018-08-09 18:28:15 +02:00