Frederik Rietdijk c31cb577ae Merge master into staging-next		2018-11-22 09:57:08 +01:00
..
applications	Merge master into staging-next	2018-11-22 09:57:08 +01:00
build-support	Merge master into staging-next	2018-11-22 09:57:08 +01:00
common-updater
data	all-cabal-hashes: update to Hackage at 2018-11-19T08:07:53Z	2018-11-21 16:06:22 +01:00
desktops
development	Merge master into staging-next	2018-11-22 09:57:08 +01:00
games	openarena: add missing dependency - openal (#50903)	2018-11-22 02:43:56 -05:00
misc	Merge master into staging-next	2018-11-21 12:39:20 +01:00
os-specific	Merge master into staging-next	2018-11-22 09:57:08 +01:00
servers	Merge master into staging-next	2018-11-22 09:57:08 +01:00
shells	pythonPackages.prompt_toolkit: 1.0.15 -> 2.0.7	2018-11-21 12:38:54 +01:00
stdenv	Merge master into staging-next	2018-11-22 09:57:08 +01:00
test
tools	Merge master into staging-next	2018-11-22 09:57:08 +01:00
top-level	Merge master into staging-next	2018-11-22 09:57:08 +01:00