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)
1  2 
compiler/ghc.mk
compiler/main/DynFlags.hs

diff --cc compiler/ghc.mk
Simple merge
Simple merge