diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:58:02 +0100 |
| commit | 980b7de55c897cb38f5706164a053f38c1b35d88 (patch) | |
| tree | 34b80af4ad8b97fc5c31768be1073d91dc659c46 /offapi/com/sun/star/text/TextGridMode.idl | |
| parent | 2475c0b62d65f9db542d4fd0a0792795a39185a2 (diff) | |
| parent | c953ef4b46ced010ed3ebd77c4dd11174da60dd1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
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
Diffstat (limited to 'offapi/com/sun/star/text/TextGridMode.idl')
0 files changed, 0 insertions, 0 deletions