From: Ivan Maidanski Date: Fri, 30 Sep 2011 13:40:43 +0000 (+0400) Subject: Resolve minor merge conflict in gc_disclaim.h, disclaim_bench.c X-Git-Tag: gc7_3alpha2~320^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b6a4a5d3ec047280201bbcd90a1b3efaa6f000f;p=gc Resolve minor merge conflict in gc_disclaim.h, disclaim_bench.c --- 3b6a4a5d3ec047280201bbcd90a1b3efaa6f000f