Fri, 28 Jun 2013 19:47:54 -0700
Merge
1.1 --- a/.hgtags Fri Jun 28 14:36:06 2013 +0100 1.2 +++ b/.hgtags Fri Jun 28 19:47:54 2013 -0700 1.3 @@ -216,3 +216,5 @@ 1.4 149890642a0ed5138a4f16fe08ddbfeb8f8a1cb4 jdk8-b92 1.5 2c5a568ee36eb2d9471483b7a310c49ed545db55 jdk8-b93 1.6 48c6e6ab7c815fd41d747f0218f8041c22f3a460 jdk8-b94 1.7 +4cb1136231275a1f8af53f5bfdef0b488e4b5bab jdk8-b95 1.8 +988aef3a8c3adac482363293f65e77ec4c5ce98d jdk8-b96
2.1 --- a/test/tools/javac/6567415/T6567415.java Fri Jun 28 14:36:06 2013 +0100 2.2 +++ b/test/tools/javac/6567415/T6567415.java Fri Jun 28 19:47:54 2013 -0700 2.3 @@ -1,5 +1,5 @@ 2.4 /* 2.5 - * Copyright (c) 2010, 2013 Oracle and/or its affiliates. All rights reserved. 2.6 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. 2.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 * 2.9 * This code is free software; you can redistribute it and/or modify it