Mercurial > hg > truffle
diff src/share/vm/runtime/timer.cpp @ 6911:d2582a08fa5d
Merge
author | asaha |
---|---|
date | Thu, 18 Oct 2012 21:58:55 -0700 |
parents | b9a9ed0f8eeb |
children | 0f80645e9c26 |
line wrap: on
line diff
--- a/src/share/vm/runtime/timer.cpp Thu Oct 11 15:29:16 2012 -0700 +++ b/src/share/vm/runtime/timer.cpp Thu Oct 18 21:58:55 2012 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 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