Merge remote branch 'origin/master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:00 +0000 (14:33 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 13:33:00 +0000 (14:33 +0100)
commit97ce7b595418d629a57654b5af07133e6418b45e
tree256899d51bac2d8fcd20496c07e6798829bec1c7
parent5188e4e515d6d890ae98e3fbca99ddaf93639d03
parent80f5e7009434750cee746bd89f7eea5f7c7fa3fd
Merge remote branch 'origin/master' into ghc-generics
compiler/main/DynFlags.hs
docs/users_guide/flags.xml
docs/users_guide/glasgow_exts.xml