changeset 14449:8b4d83b2354e

Merge
author lana
date Tue, 06 Nov 2012 18:41:56 -0800
parents 91aa6570b59a 70fa4b11f265
children 7a62c5b13d6e
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/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
diffstat 3128 files changed, 117410 insertions(+), 75573 deletions(-) [+]