Merge branch 'with-passes' into three-eight
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 16:06:56 +0000 (12:06 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 23 Apr 2010 16:06:56 +0000 (12:06 -0400)
Conflicts:

src/hoopl.cabal

1  2 
src/hoopl.cabal

diff --cc src/hoopl.cabal
Simple merge