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/vcl/res/check.png | |
| parent | c65e526c915dcf8624fe3b1abd60a18d15edcf7e (diff) | |
| parent | 1ca3a5dee6b0b8ef79799f41dde6a01fa1b04057 (diff) | |
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/vcl/res/check.png')
| -rw-r--r-- | default_images/vcl/res/check.png | bin | 0 -> 245 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/default_images/vcl/res/check.png b/default_images/vcl/res/check.png Binary files differnew file mode 100644 index 000000000000..4d324a3c2b6f --- /dev/null +++ b/default_images/vcl/res/check.png |