strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
office-gobmx/reportbuilder/java
History
Jan Holesovsky 761118f831 Merge commit 'ooo/DEV300_m103' 
Conflicts:
	jfreereport/java/flute/makefile.mk
	jfreereport/java/libbase/makefile.mk
	jfreereport/java/libfonts/makefile.mk
	jfreereport/java/libformula/makefile.mk
	jfreereport/java/libloader/makefile.mk
	jfreereport/java/librepository/makefile.mk
	jfreereport/java/libserializer/makefile.mk
	jfreereport/java/libxml/makefile.mk
	jfreereport/java/sac/makefile.mk
	mysqlc/source/mysqlc_connection.cxx
	mysqlc/source/mysqlc_connection.hxx
	mysqlc/source/mysqlc_databasemetadata.cxx
	mysqlc/source/mysqlc_databasemetadata.hxx
	mysqlc/source/mysqlc_driver.cxx
	mysqlc/source/mysqlc_driver.hxx
	mysqlc/source/mysqlc_general.hxx
	mysqlc/source/mysqlc_preparedstatement.hxx
	mysqlc/source/mysqlc_resultsetmetadata.hxx
	mysqlc/source/mysqlc_statement.hxx
	sdext/source/minimizer/impoptimizer.cxx
	sdext/source/pdfimport/config/description.xml
	sdext/source/pdfimport/tree/drawtreevisiting.cxx
	sdext/source/presenter/PresenterWindowManager.cxx
	swext/prj/build.lst
2011-03-23 16:58:56 +01:00
..
com/sun/star/report Merge commit 'ooo/DEV300_m103' 2011-03-23 16:58:56 +01: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