merge
authorSimon Marlow <marlowsd@gmail.com>
Tue, 22 Nov 2011 11:26:28 +0000 (11:26 +0000)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 22 Nov 2011 11:26:28 +0000 (11:26 +0000)
commitd681f8700ad2c034d5b9dacf4e681b8e7279f6ee
treec808d7d5e623679e13b67d8e82d46ebbb0130005
parenta5762b71d1aaf9037d14fc706bb04976a231bf22
parent6247b59e5d31de58ee51273916bc44ac2118240a
merge
aclocal.m4
configure.ac
includes/Stg.h
includes/ghc.mk
rts/sm/GC.c