Commit c977ddd0 authored by tibbe's avatar tibbe
Browse files

Merge changes from GHC HQ fork

Conflicts:
	Cabal/Cabal.cabal
parents 830b16a5 5fa5c41c
......@@ -657,6 +657,11 @@ data KnownExtension =
-- * <http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell>
| ParallelArrays
-- | Enable explicit role annotations, like in (@data T a\@R@).
--
-- * <http://www.haskell.org/ghc/docs/latest/html/users_guide/roles.html>
| RoleAnnotations
deriving (Show, Read, Eq, Enum, Bounded, Typeable, Data)
{-# DEPRECATED knownExtensions
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment