Jan Holesovsky 66c4b436fc Merge commit 'ooo/DEV300_m106' into libreoffice-3-4 ... Conflicts: swext/mediawiki/build.xml		2011-04-22 15:08:10 +02:00
..
com/sun/star/report	Merge commit 'ooo/DEV300_m106' into libreoffice-3-4	2011-04-22 15:08:10 +02:00
jfreereport.properties	jpropenable: #i112445# exclude this file from l10n process	2010-06-16 14:30:12 +02:00
libformula.properties	jpropenable: #i112445# exclude this file from l10n process	2010-06-16 14:30:12 +02:00
loader.properties	jpropenable: #i112445# exclude this file from l10n process	2010-06-16 14:30:12 +02: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