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)
commit7076611e19ace2e90e8cbe86f0284d07a0fd924e
tree9a12339c34486f65a6f0384ea95da99a905a7b2c
parentaf9e3daaedf5f74caabdb7cd6333be9e38a6ff5a
parenta4ba7b13c96295dbad3cfe972f62e3de842fcb5d
Merge branch 'with-passes' into three-eight

Conflicts:

src/hoopl.cabal
src/hoopl.cabal