* src/mm/nogc.c: Fixed merging conflict which was commited to that file.
authormichi <none@none>
Thu, 29 Mar 2007 21:56:35 +0000 (21:56 +0000)
committermichi <none@none>
Thu, 29 Mar 2007 21:56:35 +0000 (21:56 +0000)
commit0602ed26830478604bddfb4e721ddbc673030c12
treecaab3f3aa8ae377d977cb067cf7ea4a81e5b479e
parentc5128b0b80eabc5df5a4881402091f2b9218eae8
* src/mm/nogc.c: Fixed merging conflict which was commited to that file.
src/mm/nogc.c