Jan Holesovsky ec6c98105a Merge commit 'libreoffice-3.4.0.2' ... Conflicts: svtools/source/filter/wmf/winmtf.hxx tools/source/fsys/urlobj.cxx unotools/source/config/configmgr.cxx unotools/source/config/makefile.mk vcl/inc/vcl/cursor.hxx vcl/source/gdi/outdevnative.cxx vcl/source/window/abstdlg.cxx vcl/source/window/toolbox.cxx vcl/unx/generic/printer/ppdparser.cxx vcl/unx/generic/printer/printerinfomanager.cxx		2011-05-31 10:45:54 +02:00
..
pch
svl	Merge commit 'libreoffice-3.4.0.2'	2011-05-31 10:45:54 +02:00