summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-06-13 10:51:12 -0400
committerBen Gamari <ben@smart-cactus.org>2019-06-13 10:51:12 -0400
commiteeca442ca55863fe979ccf6149da473938a35069 (patch)
treea06fef549cd18ac913156714dc45f2acd0cf9461
parentb4c1cf55862788775018eaaa5bbd2875bead30fd (diff)
parent2e8be92b454883dcba5d68e8e56c56c69d17bf0e (diff)
parent8c862c07177a70b556320f386ccd4cdb76421a26 (diff)
parentba667f6be797451f5cec01eaccb1a0d522443bb9 (diff)
parentce1e6538dd15c145394497aa6721b17c610ac1d6 (diff)
parentca7173a9902184d4f76957765a352715d75c2670 (diff)
downloadhaskell-eeca442ca55863fe979ccf6149da473938a35069.tar.gz
Merge branches 'wip/backport-MR1137', 'wip/backport-MR1139', 'wip/backport-MR1160', 'wip/backport-MR706' and 'wip/backport-MR769' into wip/ghc-8.8-merges