Merge remote-tracking branch 'joncham/sgen-msvc2'
authorRodrigo Kumpera <kumpera@gmail.com>
Wed, 10 Oct 2012 22:01:21 +0000 (18:01 -0400)
committerRodrigo Kumpera <kumpera@gmail.com>
Wed, 10 Oct 2012 22:01:21 +0000 (18:01 -0400)
commitd0baa99bcb8ef12231e24432d0b5710b3a0a4380
treea167396bc969acc1282ea6fa295ea2a061d94455
parent99c3107f1d47d707e6b7786422154292cdbcf938
parent30951a5fe82fa2cbd0c99c628eb830d0d4733a0a
Merge remote-tracking branch 'joncham/sgen-msvc2'

Conflicts:
mono/metadata/sgen-copy-object.h
mono/metadata/sgen-gc.c
mono/metadata/sgen-cardtable.c
mono/metadata/sgen-copy-object.h
mono/metadata/sgen-gc.c
mono/metadata/sgen-marksweep.c
mono/metadata/sgen-os-win32.c