summaryrefslogtreecommitdiffstats
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
parentOops Bjoern's link to .gitattributes got committed by mistake (diff)
parentVersion 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3) (diff)
downloadhelp-FINAL_MASTER.tar.gz
help-FINAL_MASTER.zip
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