projects / ghc-hetmet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 91bb651 9e27ad1)
Merge branch 'trac_5025' of https://github.com/thoughtpolice/ghc
authorSimon Marlow <marlowsd@gmail.com>
Wed, 6 Apr 2011 13:30:59 +0000 (14:30 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Wed, 6 Apr 2011 13:30:59 +0000 (14:30 +0100)
commit6caa417ded740fb8eaa50669269e38c8129092f0
treefa076eb916d9a7423a63a3c9062b28bc92177c19tree | snapshot
parent91bb651a14f8fe4163394f26af50fb8f76fa0607commit | diff
parent9e27ad106ef7036f356475daa0412ad72b56067bcommit | diff
Merge branch 'trac_5025' of https://github.com/thoughtpolice/ghc

* 'trac_5025' of https://github.com/thoughtpolice/ghc:
  Teach GHC to compile objective-c files; trac #5025

Conflicts:
compiler/main/DriverPipeline.hs
compiler/main/DriverPhases.hs diff1 | diff2 | blob | history
compiler/main/DriverPipeline.hs diff1 | diff2 | blob | history
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)