diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:31 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:07:31 +0200 |
| commit | 9b1243c85876faccaa6879f355aabc217ad2634b (patch) | |
| tree | fa540dfd02f467fad3f99d893bf19bf07a43d120 /default_images/svx/res/fr01.png | |
| parent | Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2) (diff) | |
| parent | CWS-TOOLING: integrate CWS vcl2gnumake (diff) | |
| download | core-9b1243c85876faccaa6879f355aabc217ad2634b.tar.gz core-9b1243c85876faccaa6879f355aabc217ad2634b.zip | |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
default_images/vcl/res/closedochc.png
default_images/vcl/res/collate_h.png
default_images/vcl/res/msgbox_hc.png
default_images/vcl/res/ncollate_h.png
default_images/vcl/source/src/collate_h.png
default_images/vcl/source/src/ncollate_h.png
ooo_custom_images/oxygen/svtools/res/collate_h.png
ooo_custom_images/oxygen/svtools/res/ncollate_h.png
Diffstat (limited to 'default_images/svx/res/fr01.png')
0 files changed, 0 insertions, 0 deletions