Fix some merge problems.
authorZoltan Varga <vargaz@gmail.com>
Wed, 10 Nov 2010 12:57:07 +0000 (13:57 +0100)
committerZoltan Varga <vargaz@gmail.com>
Mon, 3 Jan 2011 14:42:42 +0000 (15:42 +0100)
commitfaa029089c56fc1cb5a0cfe66ddc233c3e7de3f0
treea8b67385e47ff674f219d80905e56e510d962a46
parent108bc307e37e77b80d899e2de0842d66beef2c0e
Fix some merge problems.
mono/mini/aot-runtime.c
mono/mini/mini-exceptions.c
mono/mini/mini-gc.c