summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-07-28 18:38:12 +0200
committerJan Holesovsky <kendy@suse.cz>2011-07-28 18:38:12 +0200
commitefab8f613e6d919c5593b5a3316c21f1bde49ad7 (patch)
tree33615215460310979d6e9bc7629397c37631167d
parent7a5596b764279ecb1bd21d3fc761d0069f6cd42a (diff)
parentfadcd18c1cffbf5f87574deb4ea77cfe6a15aca9 (diff)
Merge commit 'libreoffice-3.4.2.3'FINAL_MASTER
Conflicts: helpcontent2/source/text/sbasic/shared/02/11040000.xhp helpcontent2/source/text/shared/main0213.xhp
0 files changed, 0 insertions, 0 deletions