1. 11 Jul, 2012 6 commits
  2. 10 Jul, 2012 13 commits
  3. 09 Jul, 2012 5 commits
  4. 06 Jul, 2012 7 commits
  5. 05 Jul, 2012 4 commits
  6. 04 Jul, 2012 3 commits
    • Simon Marlow's avatar
      Fix merge-related problems · 3f0afaba
      Simon Marlow authored
      3f0afaba
    • Simon Marlow's avatar
      Merge remote-tracking branch 'origin/master' into newcg · 99fd2469
      Simon Marlow authored
      * origin/master: (756 commits)
        don't crash if argv[0] == NULL (#7037)
        -package P was loading all versions of P in GHCi (#7030)
        Add a Note, copying text from #2437
        improve the --help docs a bit (#7008)
        Copy Data.HashTable's hashString into our Util module
        Build fix
        Build fixes
        Parse error: suggest brackets and indentation.
        Don't build the ghc DLL on Windows; works around trac #5987
        On Windows, detect if DLLs have too many symbols; trac #5987
        Add some more Integer rules; fixes #6111
        Fix PA dfun construction with silent superclass args
        Add silent superclass parameters to the vectoriser
        Add silent superclass parameters (again)
        Mention Generic1 in the user's guide
        Make the GHC API a little more powerful.
        tweak llvm version warning message
        New version of the patch for #5461.
        Fix Word64ToInteger conversion rule.
        Implemented feature request on reconfigurable pretty-printing in GHCi (#5461)
        ...
      
      Conflicts:
      	compiler/basicTypes/UniqSupply.lhs
      	compiler/cmm/CmmBuildInfoTables.hs
      	compiler/cmm/CmmLint.hs
      	compiler/cmm/CmmOpt.hs
      	compiler/cmm/CmmPipeline.hs
      	compiler/cmm/CmmStackLayout.hs
      	compiler/cmm/MkGraph.hs
      	compiler/cmm/OldPprCmm.hs
      	compiler/codeGen/CodeGen.lhs
      	compiler/codeGen/StgCmm.hs
      	compiler/codeGen/StgCmmBind.hs
      	compiler/codeGen/StgCmmLayout.hs
      	compiler/codeGen/StgCmmUtils.hs
      	compiler/main/CodeOutput.lhs
      	compiler/main/HscMain.hs
      	compiler/nativeGen/AsmCodeGen.lhs
      	compiler/simplStg/SimplStg.lhs
      99fd2469
    • phercek's avatar
      prefer later defined commands (fixes #3858) · ad16de23
      phercek authored
      ad16de23
  7. 03 Jul, 2012 2 commits