Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:43 +0000 (14:24 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 15 Aug 2012 13:24:43 +0000 (14:24 +0100)
commitc848891acfc7059a6ef19c80ec7958c26e1327fe
treecff96fad5e16253b2db30245b785df7fbd375531
parent10377bba65de7463b909cc7cd5781a46620f305a
parent55cdcc96d1e38e6fd3e2ef7727a43d1fe77e2d71
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
compiler/typecheck/TcInstDcls.lhs
docs/users_guide/glasgow_exts.xml