diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/source/auxiliary/tr/sdatabase.cfg | |
parent | l10n is conditionned on L10N: (diff) | |
parent | masterfix DEV300: #i10000# usage of L10N build_type (diff) | |
download | help-bc131c1ceaca2a227d4827f765e83faa0754a3f1.tar.gz help-bc131c1ceaca2a227d4827f765e83faa0754a3f1.zip |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/source/auxiliary/tr/sdatabase.cfg')
0 files changed, 0 insertions, 0 deletions