Mercurial > hg > graal-compiler
changeset 11012:3463b5b373f7
Merge
author | chegar |
---|---|
date | Wed, 24 Apr 2013 10:17:40 +0100 |
parents | be131aa5a529 (current diff) d4c266784660 (diff) |
children | f822ecf621ce |
files | |
diffstat | 7 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Apr 22 08:33:12 2013 -0400 +++ b/.hgtags Wed Apr 24 10:17:40 2013 +0100 @@ -333,3 +333,4 @@ 42fe530cd478744a4d12a0cbf803f0fc804bab1a jdk8-b85 09b0d3e9ba6cdf7da07d4010d2d1df14596f6864 hs25-b27 6d88a566d369f6a1f86912cad7d0912686b2fda1 hs25-b28 +86db4847f195c0ecceea646431f1ff22d56282e8 jdk8-b86
--- a/make/bsd/makefiles/fastdebug.make Mon Apr 22 08:33:12 2013 -0400 +++ b/make/bsd/makefiles/fastdebug.make Wed Apr 24 10:17:40 2013 +0100 @@ -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 Mon Apr 22 08:33:12 2013 -0400 +++ b/src/share/vm/services/diagnosticArgument.cpp Wed Apr 24 10:17:40 2013 +0100 @@ -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 Mon Apr 22 08:33:12 2013 -0400 +++ b/test/sanity/WBApi.java Wed Apr 24 10:17:40 2013 +0100 @@ -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 Mon Apr 22 08:33:12 2013 -0400 +++ b/test/serviceability/ParserTest.java Wed Apr 24 10:17:40 2013 +0100 @@ -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 Mon Apr 22 08:33:12 2013 -0400 +++ b/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java Wed Apr 24 10:17:40 2013 +0100 @@ -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 Mon Apr 22 08:33:12 2013 -0400 +++ b/test/testlibrary/whitebox/sun/hotspot/parser/DiagnosticCommand.java Wed Apr 24 10:17:40 2013 +0100 @@ -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