Jan Holesovsky 61a4bf5a07 Merge remote-tracking branch 'origin/integration/dev300_m101' ... Conflicts: set_soenv.in		2011-03-17 16:06:07 +01:00
..
makefile.mk	Merge remote-tracking branch 'origin/integration/dev300_m101'	2011-03-17 16:06:07 +01:00
openoffice.lst	Merge commit 'ooo/DEV300_m101' into integration/dev300_m101	2011-03-08 19:43:29 -06:00
pack.lst	Merge commit 'ooo/OOO330_m13'	2010-11-01 13:49:01 +01:00
update.xml	Switch all urls from TDF to LibreOffice	2010-10-19 18:05:32 +02:00