Merge branch 'master' of linux:/r/ghc/www/hoopl/hoopl into with-passes
authorNorman Ramsey <nr@cs.tufts.edu>
Wed, 21 Apr 2010 21:05:14 +0000 (17:05 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Wed, 21 Apr 2010 21:05:14 +0000 (17:05 -0400)
commitf2241079f6aa78837693fc658c463df2e7e7f57b
treef093f6e846dcf2f2ed5a32669a6331daf0236ad2
parent8b15595f7dc7f522563efbdbefa57f3598eaea44
parent77a62005c5bb83ba280e810eebc0dff6db07b27c
Merge branch 'master' of linux:/r/ghc/www/hoopl/hoopl into with-passes

Conflicts:

src/hoopl.cabal
src/hoopl.cabal