Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branches: master,ghc-7.4
http://hackage.haskell.org/trac/ghc/changeset/12e619d5b00d205443768c224da2bfb045569590 >--------------------------------------------------------------- commit 12e619d5b00d205443768c224da2bfb045569590 Merge: 505df72... 60a0435... Author: David Waern <[email protected]> Date: Tue Dec 27 13:33:41 2011 +0100 Merge ../../../haddock Conflicts: src/Haddock/InterfaceFile.hs haddock.cabal | 2 - src/Documentation/Haddock.hs | 1 - src/Haddock/GhcUtils.hs | 14 +- src/Haddock/Interface/AttachInstances.hs | 9 +- src/Haddock/Interface/Create.hs | 456 +++++++++----------- src/Haddock/Interface/ExtractFnArgDocs.hs | 49 --- src/Haddock/Interface/Rename.hs | 19 +- src/Haddock/InterfaceFile.hs | 14 +- src/Haddock/Types.hs | 40 ++- tests/html-tests/tests/Test.hs | 10 +- tests/html-tests/tests/Test.html.ref | 34 ++ tests/html-tests/tests/Unicode.hs | 6 + .../tests/{Bug3.html.ref => Unicode.html.ref} | 15 +- 13 files changed, 308 insertions(+), 361 deletions(-) diff --cc src/Haddock/InterfaceFile.hs index 52f04f1,2117988..fcf7fe6 --- a/src/Haddock/InterfaceFile.hs +++ b/src/Haddock/InterfaceFile.hs @@@ -65,13 -65,9 +65,13 @@@ binaryInterfaceMagic = 0xD0Cfac -- we version our interface files accordingly. binaryInterfaceVersion :: Word16 #if __GLASGOW_HASKELL__ == 702 - binaryInterfaceVersion = 18 + binaryInterfaceVersion = 19 #elif __GLASGOW_HASKELL__ == 703 - binaryInterfaceVersion = 18 + binaryInterfaceVersion = 19 +#elif __GLASGOW_HASKELL__ == 704 - binaryInterfaceVersion = 18 ++binaryInterfaceVersion = 19 +#elif __GLASGOW_HASKELL__ == 705 - binaryInterfaceVersion = 18 ++binaryInterfaceVersion = 19 #else #error Unknown GHC version #endif _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
