changeset 5580:629274e4c99f

Merge
author lana
date Sat, 29 May 2010 23:26:16 -0700
parents 1a5e995a710b 13f0c0b9b50e
children e11a0ff6cd7e 5f6d488b1972
files jdk/make/common/Defs-solaris.gmk jdk/make/sun/awt/mapfile-mawt-vers jdk/make/sun/awt/mapfile-vers-linux jdk/make/sun/headless/mapfile-vers jdk/make/sun/jawt/Makefile jdk/make/sun/xawt/FILES_c_unix.gmk jdk/make/sun/xawt/Makefile jdk/make/sun/xawt/mapfile-vers jdk/src/share/classes/java/awt/Font.java jdk/src/share/classes/sun/font/StrikeCache.java jdk/src/share/classes/sun/font/SunFontManager.java jdk/src/share/classes/sun/java2d/pipe/BufferedPaints.java jdk/src/share/classes/sun/java2d/pipe/RenderBuffer.java jdk/src/share/native/sun/font/AccelGlyphCache.c jdk/src/share/native/sun/font/fontscalerdefs.h jdk/src/share/native/sun/font/freetypeScaler.c jdk/src/share/native/sun/font/sunFont.c jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java jdk/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
diffstat 19481 files changed, 98408 insertions(+), 98399 deletions(-) [+]