Mercurial > hg > truffle
diff src/share/vm/services/memReporter.cpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 79f492f184d0 |
children | 3c9db54c2660 |
line wrap: on
line diff
--- a/src/share/vm/services/memReporter.cpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/services/memReporter.cpp Wed Jan 16 01:34:24 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it