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)
commit67d1d4edd5943f4425578a87e6f0940a442b3892
treebb83a454f677b372c4f82502d2ff5edf92f34d65
parent1f5338e7b71f56c6d2451b9b23608c851bf90c8a
parentdf614779c356ea6aef29367a8dd1ca819b03a1d1
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
compiler/ghc.mk
compiler/main/SysTools.lhs