Mercurial > hg > truffle
changeset 10093:c9eb0ec1c792
Merge
author | katleman |
---|---|
date | Mon, 15 Apr 2013 14:19:58 -0700 |
parents | 511e334ee345 (current diff) b0301c02f38e (diff) |
children | 86db4847f195 |
files | test/testlibrary/whitebox/sun/hotspot/WhiteBox.java |
diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/fastdebug.make Thu Apr 11 16:35:19 2013 -0700 +++ b/make/bsd/makefiles/fastdebug.make Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2012 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1999, 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
--- a/src/share/vm/services/diagnosticArgument.cpp Thu Apr 11 16:35:19 2013 -0700 +++ b/src/share/vm/services/diagnosticArgument.cpp Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, 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
--- a/test/sanity/WBApi.java Thu Apr 11 16:35:19 2013 -0700 +++ b/test/sanity/WBApi.java Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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
--- a/test/serviceability/ParserTest.java Thu Apr 11 16:35:19 2013 -0700 +++ b/test/serviceability/ParserTest.java Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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
--- a/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Thu Apr 11 16:35:19 2013 -0700 +++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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
--- a/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java Thu Apr 11 16:35:19 2013 -0700 +++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java Mon Apr 15 14:19:58 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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