Resolve conflict by exporting both Zipper and Passes.Dominator
authorNorman Ramsey <nr@cs.tufts.edu>
Sat, 17 Apr 2010 02:54:30 +0000 (22:54 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Sat, 17 Apr 2010 02:54:30 +0000 (22:54 -0400)
Merge branch 'master' of /home/nr/papers/simon/dfopt/ into with-passes

Conflicts:

src/hoopl.cabal

1  2 
src/hoopl.cabal

diff --cc src/hoopl.cabal
@@@ -16,7 -16,7 +16,8 @@@ Extra-source-files:  README, hoopl.pdf
  Library
    Build-Depends:     base >= 3 && < 5, containers
    Exposed-modules:   Compiler.Hoopl,
 +                     Compiler.Hoopl.Passes.Dominator
+                        Compiler.Hoopl.Zipper
    Other-modules:     Compiler.Hoopl.GraphUtil,
                       -- GraphUtil should *never* be seen by clients.
                       -- The remaining modules are hidden *provisionally*