diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:39:38 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:39:38 +0200 |
commit | cb8c6ebedbf9ef071aa16650194f26189b96ed20 (patch) | |
tree | c38093affbcaf8d1c250ddce498c046d8dcbf68c | |
parent | 6cdd9efc81387d6d41d15b946d60142e2cc76dbb (diff) | |
parent | 3d835172b2e332e77bcf81c41361d0c32c2245a3 (diff) |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
offapi/com/sun/star/sheet/NameToken.idl
0 files changed, 0 insertions, 0 deletions