a3a19632f4
Conflicts: bridges/source/remote/urp/urp_environment.cxx bridges/source/remote/urp/urp_propertyobject.cxx bridges/source/remote/urp/urp_reader.cxx remotebridges/source/factory/bridgefactory.cxx stoc/source/corereflection/crefl.cxx stoc/source/javavm/javavm.cxx stoc/source/simpleregistry/simpleregistry.cxx |
||
---|---|---|
.. | ||
java/com/sun/star/bridges/jni_uno | ||
java_uno.map | ||
jni_base.h | ||
jni_bridge.cxx | ||
jni_bridge.h | ||
jni_data.cxx | ||
jni_helper.h | ||
jni_info.cxx | ||
jni_info.h | ||
jni_java2uno.cxx | ||
jni_uno2java.cxx | ||
makefile.mk | ||
nativethreadpool.cxx |