Mercurial > hg > truffle
diff src/share/vm/prims/jvm.h @ 4138:82af018d61db
Merge fixes.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 22:03:44 +0100 |
parents | 436b4a3231bf |
children | 8b0a4867acf0 |
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 22:03:44 +0100 |
parents | 436b4a3231bf |
children | 8b0a4867acf0 |