Merge branch 'ghc-parmake-gsoc' (#910)
authorPatrick Palka <patrick@parcs.ath.cx>
Mon, 9 Sep 2013 20:28:02 +0000 (16:28 -0400)
committerPatrick Palka <patrick@parcs.ath.cx>
Mon, 9 Sep 2013 20:28:02 +0000 (16:28 -0400)
commit9c18ad7475bdc5bd5684a702c2d575ef9dd86fe1
tree221d8fc229af7823876fe1d8ceb9bc7e9d9aff0e
parentc62a0b993989fc2271be34e2c05462b6c5bb0fa6
parent783ca393d9b262fe0efc6308e71c95a2da0eda1a
Merge branch 'ghc-parmake-gsoc' (#910)
compiler/ghc.mk
compiler/main/DynFlags.hs