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

..

sbasic

Merge commit 'ooo/DEV300_m103'

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

scalc

Merge commit 'ooo/DEV300_m103'

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

schart

Merge commit 'ooo/DEV300_m103'

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

sdatabase

Merge commit 'ooo/DEV300_m103'

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

sdraw

Merge commit 'ooo/DEV300_m103'

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

shared

tl79:Help makefiles

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

simpress

Merge commit 'ooo/DEV300_m103'

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

smath

Merge commit 'ooo/DEV300_m103'

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

swriter

Merge commit 'ooo/DEV300_m103'

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

delzip

Flag file. Touch it to get ZIPTARGET rebuild instead of just updated.

2004-12-13 08:49:55 +00:00

makefile.mk

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

target.pmk

Merge commit 'ooo/DEV300_m103'

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