Merge branch 'master' of https://github.com/snowleopard/shaking-up-ghc
authorNeil Mitchell <ndmitchell@gmail.com>
Sun, 10 Jan 2016 20:28:45 +0000 (20:28 +0000)
committerNeil Mitchell <ndmitchell@gmail.com>
Sun, 10 Jan 2016 20:28:45 +0000 (20:28 +0000)
1  2 
src/Base.hs
src/GHC.hs
src/Oracles/LookupInPath.hs
src/Rules/Data.hs
src/Rules/Libffi.hs
src/Rules/Library.hs

diff --cc src/Base.hs
Simple merge
diff --cc src/GHC.hs
Simple merge
@@@ -1,9 -1,8 +1,7 @@@
  {-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}
- module Oracles.LookupInPath (
-     lookupInPath, lookupInPathOracle
-     ) where
+ module Oracles.LookupInPath (lookupInPath, lookupInPathOracle) where
  
  import Base
 -import Extra (wordsBy)
  
  newtype LookupInPath = LookupInPath String
      deriving (Show, Typeable, Eq, Hashable, Binary, NFData)
Simple merge
Simple merge
Simple merge