Jan Holesovsky b6212a4a95 Merge remote-tracking branch 'origin/libreoffice-3-4' ... Conflicts: connectivity/qa/makefile.mk sfx2/source/appl/appdata.cxx sfx2/source/appl/appinit.cxx sfx2/source/inc/appdata.hxx sysui/desktop/productversion.mk xmloff/source/forms/elementimport.cxx		2011-06-06 14:06:48 +02:00
..
complex/connectivity
connectivity/tools
makefile.mk
scenarios.sce