changeset 2371:be6f14f83ea7

Merge
author lana
date Sat, 29 May 2010 23:26:16 -0700
parents 5294c7067018 4255ca314883
children 18ee3c1b9143 4d55419ce99e
files make/common/Defs-solaris.gmk make/sun/awt/mapfile-mawt-vers make/sun/awt/mapfile-vers-linux make/sun/headless/mapfile-vers make/sun/jawt/Makefile make/sun/xawt/FILES_c_unix.gmk make/sun/xawt/Makefile make/sun/xawt/mapfile-vers src/share/classes/java/awt/Font.java src/share/classes/sun/font/StrikeCache.java src/share/classes/sun/font/SunFontManager.java src/share/classes/sun/java2d/pipe/BufferedPaints.java src/share/classes/sun/java2d/pipe/RenderBuffer.java src/share/native/sun/font/AccelGlyphCache.c src/share/native/sun/font/fontscalerdefs.h src/share/native/sun/font/freetypeScaler.c src/share/native/sun/font/sunFont.c src/share/native/sun/java2d/opengl/OGLTextRenderer.c src/solaris/classes/sun/awt/X11GraphicsDevice.java src/solaris/classes/sun/awt/X11GraphicsEnvironment.java src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java src/solaris/classes/sun/java2d/x11/X11SurfaceData.java src/solaris/native/sun/java2d/x11/X11SurfaceData.c src/solaris/native/sun/java2d/x11/X11SurfaceData.h
diffstat 16486 files changed, 84944 insertions(+), 84943 deletions(-) [+]