Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <waern@ubuntu.(none)>
Sun, 10 Mar 2013 19:24:42 +0000 (12:24 -0700)
committerDavid Waern <waern@ubuntu.(none)>
Sun, 10 Mar 2013 19:24:42 +0000 (12:24 -0700)
1  2 
mk/config.mk.in

diff --cc mk/config.mk.in
Simple merge