changeset 5824:a9556dc02a12

Merge
author lana
date Wed, 16 Jun 2010 13:41:34 -0700
parents 3ed9d501bfd8 db6e66012044
children 4afda5cf7fc3 51c1b6d4e76e
files jdk/make/com/sun/inputmethods/Makefile jdk/make/com/sun/inputmethods/indicim/Makefile jdk/make/com/sun/inputmethods/thaiim/Makefile jdk/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java jdk/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java jdk/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethod.java jdk/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java jdk/src/share/classes/com/sun/inputmethods/internal/indicim/java.awt.im.spi.InputMethodDescriptor jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_fr.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ja.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_sv.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_CN.properties jdk/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethod.java jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodImpl.java jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiRules.java jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/java.awt.im.spi.InputMethodDescriptor jdk/src/share/classes/com/sun/inputmethods/internal/thaiim/resources/DisplayNames.properties jdk/src/share/classes/javax/swing/text/html/parser/html32.bdtd jdk/src/share/classes/sun/security/tools/PolicyTool.java
diffstat 3733 files changed, 35489 insertions(+), 22160 deletions(-) [+]