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)
1  2 
aclocal.m4
configure.ac
includes/Stg.h
includes/ghc.mk
rts/sm/GC.c

diff --cc aclocal.m4
Simple merge
diff --cc configure.ac
Simple merge
diff --cc includes/Stg.h
Simple merge
diff --cc includes/ghc.mk
Simple merge
diff --cc rts/sm/GC.c
Simple merge