# HG changeset patch # User William Roberts # Date 1268572141 0 # Node ID 0fdfe802150c60dfa7935f3dceb3ca10598bd19c # Parent 3b04987a4caf75a99d7ff4876f4b78d2203d902d# Parent 014f8c42e1d4e3d2f68ba37e1e7a220978b374a6 Automatic merge from PDK_3.0.h diff -r 014f8c42e1d4 -r 0fdfe802150c bld.inf diff -r 014f8c42e1d4 -r 0fdfe802150c group/bld.inf diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/group/bld.inf diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/client/inc/javaattributes.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/client/inc/javaregclient.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/common/inc/javapropertyarray.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/common/inc/javaregburstates.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/common/inc/javaregdef.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/common/inc/javaregproperty.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/javaregistry/clientserver/common/inc/javareguidarrayconv.h diff -r 014f8c42e1d4 -r 0fdfe802150c java_stubs/rom/javastubs.iby diff -r 014f8c42e1d4 -r 0fdfe802150c jrt_plat/java_registry_api/inc/appversion.inl diff -r 014f8c42e1d4 -r 0fdfe802150c layers.sysdef.xml