Merge branch 'three-eight' of linux.cs.tufts.edu:/r/c--/papers/dfopt into three-eight
authorNorman Ramsey <nr@cs.tufts.edu>
Fri, 7 May 2010 19:04:43 +0000 (15:04 -0400)
committerNorman Ramsey <nr@cs.tufts.edu>
Fri, 7 May 2010 19:04:43 +0000 (15:04 -0400)
commit9b12f30c90a282edbe49e0cef6749147b480145f
tree70a40f4d62b9cafc438ab907ffbecde193cd9d6a
parente0094b080f4d51d894eff753ac3593ec5da9ba8b
parent89238e6a5b0f661b65c4563e466a8776ca061d6b
Merge branch 'three-eight' of linux.cs.tufts.edu:/r/c--/papers/dfopt into three-eight

Conflicts:

testing/Ast2ir.hs
testing/ConstProp.hs
testing/Live.hs
testing/OptSupport.hs
testing/Simplify.hs
src/CHANGES
src/Compiler/Hoopl/Passes/Dominator.hs
src/hoopl.cabal
testing/ConstProp.hs
testing/Live.hs
testing/Test.hs