Merge remote-tracking branch 'cabal/master'
Conflicts: Cabal/Distribution/ParseUtils.hs
Showing
- .travis.yml 1 addition, 0 deletions.travis.yml
- Cabal/Cabal.cabal 4 additions, 1 deletionCabal/Cabal.cabal
- Cabal/Distribution/Compat/CreatePipe.hs 75 additions, 0 deletionsCabal/Distribution/Compat/CreatePipe.hs
- Cabal/Distribution/Compiler.hs 1 addition, 30 deletionsCabal/Distribution/Compiler.hs
- Cabal/Distribution/License.hs 1 addition, 30 deletionsCabal/Distribution/License.hs
- Cabal/Distribution/Make.hs 1 addition, 30 deletionsCabal/Distribution/Make.hs
- Cabal/Distribution/ModuleName.hs 1 addition, 30 deletionsCabal/Distribution/ModuleName.hs
- Cabal/Distribution/Package.hs 1 addition, 30 deletionsCabal/Distribution/Package.hs
- Cabal/Distribution/PackageDescription.hs 1 addition, 30 deletionsCabal/Distribution/PackageDescription.hs
- Cabal/Distribution/PackageDescription/Check.hs 1 addition, 30 deletionsCabal/Distribution/PackageDescription/Check.hs
- Cabal/Distribution/PackageDescription/Configuration.hs 1 addition, 30 deletionsCabal/Distribution/PackageDescription/Configuration.hs
- Cabal/Distribution/PackageDescription/Parse.hs 7 additions, 30 deletionsCabal/Distribution/PackageDescription/Parse.hs
- Cabal/Distribution/PackageDescription/PrettyPrint.hs 1 addition, 30 deletionsCabal/Distribution/PackageDescription/PrettyPrint.hs
- Cabal/Distribution/ParseUtils.hs 13 additions, 34 deletionsCabal/Distribution/ParseUtils.hs
- Cabal/Distribution/ReadE.hs 1 addition, 31 deletionsCabal/Distribution/ReadE.hs
- Cabal/Distribution/Simple.hs 1 addition, 30 deletionsCabal/Distribution/Simple.hs
- Cabal/Distribution/Simple/Bench.hs 1 addition, 30 deletionsCabal/Distribution/Simple/Bench.hs
- Cabal/Distribution/Simple/Build.hs 2 additions, 32 deletionsCabal/Distribution/Simple/Build.hs
- Cabal/Distribution/Simple/BuildPaths.hs 1 addition, 30 deletionsCabal/Distribution/Simple/BuildPaths.hs
- Cabal/Distribution/Simple/Command.hs 1 addition, 30 deletionsCabal/Distribution/Simple/Command.hs
Loading
Please register or sign in to comment