summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-07-28 18:39:38 +0200
committerJan Holesovsky <kendy@suse.cz>2011-07-28 18:39:38 +0200
commitcb8c6ebedbf9ef071aa16650194f26189b96ed20 (patch)
treec38093affbcaf8d1c250ddce498c046d8dcbf68c
parent6cdd9efc81387d6d41d15b946d60142e2cc76dbb (diff)
parent3d835172b2e332e77bcf81c41361d0c32c2245a3 (diff)
Merge commit 'libreoffice-3.4.2.3'
Conflicts: offapi/com/sun/star/sheet/NameToken.idl
0 files changed, 0 insertions, 0 deletions