Mercurial > hg > truffle
comparison src/share/vm/runtime/timer.cpp @ 6911:d2582a08fa5d
Merge
author | asaha |
---|---|
date | Thu, 18 Oct 2012 21:58:55 -0700 |
parents | b9a9ed0f8eeb |
children | 0f80645e9c26 |
comparison
equal
deleted
inserted
replaced
6910:6ba00f89fbe1 | 6911:d2582a08fa5d |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |