Merge branch 'master' into type-nats
authorIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:32:11 +0000 (10:32 -0700)
committerIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:32:11 +0000 (10:32 -0700)
Conflicts:
base.cabal

1  2 
base.cabal

diff --cc base.cabal
@@@ -94,8 -94,7 +94,8 @@@ Library 
              GHC.Show,
              GHC.Stable,
              GHC.Storable,
+             GHC.STRef,
 +            GHC.TypeNats,
              GHC.TopHandler,
              GHC.Unicode,
              GHC.Weak,