Peter Simons a11eaf1f04 haskell-regex-tdfa: drop obsolete override for ghc-8.4.x		2018-03-15 21:33:05 +01:00
..
applications	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
build-support	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
common-updater
data	hackage: update db snapshot	2018-03-15 21:33:05 +01:00
desktops	evince: 3.26.0 -> 3.28.0	2018-03-14 02:49:40 -07:00
development	haskell-regex-tdfa: drop obsolete override for ghc-8.4.x	2018-03-15 21:33:05 +01:00
games	Merge pull request #36985 from obsidiansystems/no-allBut	2018-03-14 18:57:28 -04:00
misc	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
os-specific	Merge remote-tracking branch 'upstream/master' into HEAD	2018-03-15 22:31:29 +02:00
servers	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
stdenv	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
test
tools	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00
top-level	Merge commit '3ab2949' from staging into master	2018-03-15 22:30:56 +02:00