Merge commit '5229c43ccf77bcbffeced01dccb27398d017fa34'
authorBen Gamari <ben@smart-cactus.org>
Fri, 10 Nov 2017 14:28:36 +0000 (09:28 -0500)
committerBen Gamari <ben@smart-cactus.org>
Fri, 10 Nov 2017 14:28:36 +0000 (09:28 -0500)
1  2 
hadrian/cfg/system.config.in
hadrian/src/Oracles/Flag.hs
hadrian/src/Settings/Builders/Common.hs
hadrian/src/Settings/Packages/GhcPrim.hs
hadrian/src/Settings/Packages/Rts.hs
hadrian/src/Settings/Warnings.hs

Simple merge
Simple merge
Simple merge
Simple merge