Mercurial > hg > openjdk > lambda > langtools
changeset 2277:66147d50d8d6
Merge
author | lana |
---|---|
date | Fri, 28 Jun 2013 19:47:54 -0700 |
parents | bdd699d7378d (current diff) 6a11a81a8824 (diff) |
children | 891c5ecb8306 |
files | |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jun 28 14:36:06 2013 +0100 +++ b/.hgtags Fri Jun 28 19:47:54 2013 -0700 @@ -216,3 +216,5 @@ 149890642a0ed5138a4f16fe08ddbfeb8f8a1cb4 jdk8-b92 2c5a568ee36eb2d9471483b7a310c49ed545db55 jdk8-b93 48c6e6ab7c815fd41d747f0218f8041c22f3a460 jdk8-b94 +4cb1136231275a1f8af53f5bfdef0b488e4b5bab jdk8-b95 +988aef3a8c3adac482363293f65e77ec4c5ce98d jdk8-b96
--- a/test/tools/javac/6567415/T6567415.java Fri Jun 28 14:36:06 2013 +0100 +++ b/test/tools/javac/6567415/T6567415.java Fri Jun 28 19:47:54 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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