Mercurial > hg > truffle
diff src/share/vm/runtime/perfMemory.cpp @ 7066:7d815d842ee0
Merge.
author | Christian Haeubl <haeubl@ssw.jku.at> |
---|---|
date | Fri, 23 Nov 2012 11:50:27 +0100 |
parents | b9a9ed0f8eeb |
children | e89b54bf4e51 |
line wrap: on
line diff
--- a/src/share/vm/runtime/perfMemory.cpp Fri Nov 23 11:40:17 2012 +0100 +++ b/src/share/vm/runtime/perfMemory.cpp Fri Nov 23 11:50:27 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 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