Mercurial > hg > release > icedtea7-forest-2.6 > langtools
changeset 1310:b6aa87579acb
Merge jdk7u10-b07
| author | andrew |
|---|---|
| date | Mon, 17 Sep 2012 16:38:05 +0100 |
| parents | f8c0e59e1be5 (current diff) f2e406264c8c (diff) |
| children | 1045d2bf8428 |
| files | .hgtags |
| diffstat | 2 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 17 16:06:39 2012 +0100 +++ b/.hgtags Mon Sep 17 16:38:05 2012 +0100 @@ -213,3 +213,5 @@ df5cbe436d3460af4667d416877e03400de54524 jdk7u8-b03 d4296a07e45a0cffbca17c608916ff6bcec78d75 jdk7u8-b04 1b7eaaffd58359639346661196309005a374192f jdk7u8-b05 +e1f380574f5490ef785282b81b6b38626109444b jdk7u10-b06 +cd18b83736af19afbccce4b7351c5a3c857356ac jdk7u10-b07
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java Mon Sep 17 16:06:39 2012 +0100 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ExpertTaglet.java Mon Sep 17 16:38:05 2012 +0100 @@ -1,6 +1,26 @@ /* - * Copyright (c) 2006, 2012 Oracle and/or its affiliates. All rights reserved. - * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + * Copyright (c) 2006, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. */ package com.sun.tools.doclets.internal.toolkit.taglets;