Jan Holesovsky bc131c1cea 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

2011-03-23 16:59:16 +01:00

..

00

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

01

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

02

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

04

tl79:Help makefiles

2010-06-10 13:32:14 +02:00

05

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

07

tl79:Help makefiles

2010-06-10 13:32:14 +02:00

autokorr

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

autopi

hcshared28: merge with DEV300_m92

2010-11-08 17:00:41 +01:00

explorer/database

hcshared28: merge with DEV300_m92

2010-11-08 17:00:41 +01:00

guide

dr79: rebase to DEV300_m100

2011-02-15 10:57:32 +01:00

optionen

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

3dsettings_toolbar.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

fontwork_toolbar.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0108.xhp

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:59:16 +01:00

main0201.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0204.xhp

hcshared29: end-of-year commitment

2010-12-17 09:46:32 +01:00

main0208.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

main0209.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0212.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

main0213.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0214.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

main0226.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0227.xhp

CWS changehid: #i115137#: adjust help content to changed HIDs

2010-10-20 12:17:42 +02:00

main0400.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

main0500.xhp

native0: branding Help - transplanted from 9dbf1800d8b2@native0

2010-03-26 15:54:27 +01:00

main0600.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

main0650.xhp

native0: branding Help - transplanted from 9dbf1800d8b2@native0

2010-03-26 15:54:27 +01:00

main0800.xhp

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

makefile.mk

hcshared29: end-of-year commitment

2010-12-17 09:46:32 +01:00

tree_strings.xhp

dr79: #i116407# change term 'DataPilot' to 'Pivot Table' in help, thanks to UFI

2011-01-12 10:06:16 +01:00