Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
authorPatrick Palka <patrick@parcs.ath.cx>
Fri, 6 Sep 2013 15:08:38 +0000 (11:08 -0400)
committerPatrick Palka <patrick@parcs.ath.cx>
Fri, 6 Sep 2013 15:08:38 +0000 (11:08 -0400)
1  2 
compiler/ghc.mk
compiler/main/SysTools.lhs

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