Merge branch 'master' into with-passes
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 16 Apr 2010 21:02:00 +0000 (17:02 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 16 Apr 2010 21:02:00 +0000 (17:02 -0400)
commit0c23bf166ee20777fcd30191026f9bf500438e33
tree1a2d87de00e9e461d1193df6d843d5b4fad4bb53
parent31cd8c605cf6804bfdf524b4d5e6ce56214129fd
parent8dc40b353de8ec3759a97897d0f44c1fb275215e
Merge branch 'master' into with-passes

Conflicts:

src/hoopl.cabal
src/hoopl.cabal