Mercurial > hg > graal-jvmci-8
changeset 10122:db9c527a1fd8
Merge
author | lana |
---|---|
date | Wed, 17 Apr 2013 21:33:05 -0700 |
parents | 86db4847f195 (diff) 6c560f9ebb3e (current diff) |
children | d4c266784660 |
files | |
diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/fastdebug.make Wed Apr 17 10:12:42 2013 -0700 +++ b/make/bsd/makefiles/fastdebug.make Wed Apr 17 21:33:05 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 Wed Apr 17 10:12:42 2013 -0700 +++ b/src/share/vm/services/diagnosticArgument.cpp Wed Apr 17 21:33:05 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 Wed Apr 17 10:12:42 2013 -0700 +++ b/test/sanity/WBApi.java Wed Apr 17 21:33:05 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 Wed Apr 17 10:12:42 2013 -0700 +++ b/test/serviceability/ParserTest.java Wed Apr 17 21:33:05 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 Wed Apr 17 10:12:42 2013 -0700 +++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Wed Apr 17 21:33:05 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 Wed Apr 17 10:12:42 2013 -0700 +++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java Wed Apr 17 21:33:05 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