Mercurial > hg > truffle
comparison src/share/vm/memory/heap.cpp @ 994:753cf9794df9
6885169: merge of 4957990 and 6863023 causes conflict on do_nmethods
Summary: After mechanically merging changes, some by-hand adjustments are needed.
Reviewed-by: ysr
| author | jrose |
|---|---|
| date | Wed, 23 Sep 2009 23:57:44 -0700 |
| parents | bd02caa94611 |
| children | 167c2986d91b |
comparison
equal
deleted
inserted
replaced
| 993:54b3b351d6f9 | 994:753cf9794df9 |
|---|