Jan Holesovsky df4a9e498c Merge commit 'libreoffice-3.4.2.3' ... Conflicts: desktop/source/app/app.cxx desktop/source/app/dispatchwatcher.cxx desktop/unx/source/splashx.c sfx2/Library_qstart.mk sfx2/Library_sfx.mk sfx2/source/bastyp/fltfnc.cxx		2011-07-28 18:35:36 +02:00
..
desktop	Merge commit 'libreoffice-3.4.2.3'	2011-07-28 18:35:36 +02:00
prj	No point building xml2cmp when cross-compiling	2011-07-14 12:25:02 +03:00
source/win32/misc
util	Remove component_getImplementationEnvironment methods	2011-07-12 17:59:13 +02:00