diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 20:06:07 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 20:06:07 +0200 |
| commit | 33b12b721ecacdc16869cfd78db05f6876137f44 (patch) | |
| tree | 4cb48f9451ddef111cd65a644268ab3118912a42 /basic/inc/basic/svtmsg.hrc | |
| parent | 9e1bffbc1abd41a11ee1ddbf449e3d631782450a (diff) | |
| parent | 2833c4cb4dc6c6def3d3cb3b134f22eda3a87207 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
Conflicts:
basic/source/runtime/dllmgr.cxx
drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
editeng/inc/editeng/boxitem.hxx
editeng/source/items/frmitems.cxx
sfx2/workben/custompanel/makefile.mk
Diffstat (limited to 'basic/inc/basic/svtmsg.hrc')
0 files changed, 0 insertions, 0 deletions