Jan Holesovsky
ca39c0ee5f
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
2011-05-31 10:45:50 +02:00
..
2011-03-29 21:40:28 +01:00
2011-05-31 10:45:50 +02:00
2011-03-29 21:40:28 +01:00
2011-03-29 21:40:28 +01:00
2011-03-29 21:40:28 +01:00