Jan Holesovsky e821621885 Merge commit 'ooo/DEV300_m103' ...

Conflicts:
	package/source/zippackage/ZipPackageFolder.cxx

2011-03-23 16:58:53 +01:00

..

dtd

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

inc

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:58:53 +01:00

prj

sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt

2010-10-22 10:37:46 +02:00

qa

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

source

Merge commit 'ooo/DEV300_m103'

2011-03-23 16:58:53 +01:00

util

sb129: #i113189# change UNO components to use passive registration

2010-09-10 13:10:07 +02:00