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
..
dialogs	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
help	masterfix OOO330: #i10000# build problem with cygwin shell (Windows)	2010-09-16 12:34:53 +02:00
src	Merge commit 'ooo/OOO330_m10'	2010-10-13 11:30:56 +02:00
build.xml	Merge commit 'ooo/DEV300_m106' into libreoffice-3-4	2011-04-22 15:08:10 +02:00
makefile.mk	fwk159: #i114231# use login token if there is any	2010-09-22 14:42:41 +02:00