Merge branch 'with-passes' of /home/nr/papers/simon/dfopt/ into with-passes
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 04:06:07 +0000 (00:06 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 04:06:07 +0000 (00:06 -0400)
commit3e4ce75e8ff13513c10da9560833245a3709e110
tree953aeead94554bb773104cb6d06b005d8a7fd6f1
parent938559eab7ae031164340e87ab1cc30a291d6691
parent4807a792a7dc081e52f7facf641e3f875a1007b3
Merge branch 'with-passes' of /home/nr/papers/simon/dfopt/ into with-passes

Conflicts:

src/hoopl.cabal
src/hoopl.cabal