changeset 14386:9ef88e958f4b

Merge
author kamg
date Fri, 02 Nov 2012 16:09:50 -0700
parents 959bbcc16725 5e86124b835d
children ac54dac010f1
files common/bin/compareimage.sh common/bin/diffexec.sh common/bin/diffjarzip.sh common/bin/difflib.sh common/bin/difftext.sh common/bin/exception_list_linux common/bin/extractvcvars.sh common/bin/unicode2x.sed common/makefiles/compress.post common/makefiles/compress.pre common/makefiles/uncompress.sed common/src/uncygdrive.c hotspot/src/share/vm/classfile/vmSymbols.hpp hotspot/src/share/vm/oops/method.cpp hotspot/src/share/vm/runtime/globals.hpp hotspot/test/runtime/7158800/BadUtf8.java hotspot/test/runtime/7158800/InternTest.java hotspot/test/runtime/7158800/Test7158800.sh hotspot/test/runtime/7158800/badstrings.txt jdk/make/sun/jdbc/Makefile jdk/makefiles/docs/CORE_PKGS.gmk jdk/makefiles/docs/Makefile jdk/makefiles/docs/NON_CORE_PKGS.gmk jdk/makefiles/docs/Notes.html jdk/makefiles/mapfiles/launchers/mapfile-amd64 jdk/makefiles/mapfiles/launchers/mapfile-i586 jdk/makefiles/mapfiles/libawt_headless/reorder-i586 jdk/makefiles/mapfiles/libjava/reorder-i586 jdk/makefiles/mapfiles/libjpeg/reorder-i586 jdk/makefiles/mapfiles/libnio/mapfile-bsd jdk/makefiles/mapfiles/libnio/reorder-i586 jdk/makefiles/mapfiles/libverify/reorder-i586 jdk/makefiles/mapfiles/libzip/reorder-i586 jdk/makefiles/sun/xawt/ToBin.java jdk/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java jdk/src/share/classes/sun/net/www/protocol/gopher/Handler.java jdk/src/share/classes/sun/security/tools/CertAndKeyGen.java jdk/src/share/classes/sun/security/tools/JarSigner.java jdk/src/share/classes/sun/security/tools/JarSignerResources.java jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java jdk/src/share/classes/sun/security/tools/KeyTool.java jdk/src/share/classes/sun/security/tools/TimestampedSigner.java jdk/src/solaris/native/java/io/FileSystem_md.c jdk/src/windows/classes/java/io/Win32FileSystem.java jdk/src/windows/native/java/io/FileSystem_md.c jdk/src/windows/native/java/io/Win32FileSystem_md.c jdk/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java jdk/test/com/sun/jndi/ldap/ReadTimeoutTest.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java langtools/src/share/classes/com/sun/tools/javac/code/TypeTags.java
diffstat 3425 files changed, 123404 insertions(+), 79030 deletions(-) [+]