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 /ooo_custom_images | |
| 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 'ooo_custom_images')
| -rw-r--r-- | ooo_custom_images/hicontrast/vcl/res/closedoc.png | bin | 0 -> 106 bytes |
| -rw-r--r-- | ooo_custom_images/hicontrast/vcl/res/collate.png (renamed from ooo_custom_images/oxygen/svtools/res/collate_h.png) | bin | 380 -> 380 bytes |
| -rw-r--r-- | ooo_custom_images/hicontrast/vcl/res/msgbox.png | bin | 0 -> 1106 bytes |
| -rw-r--r-- | ooo_custom_images/hicontrast/vcl/res/ncollate.png (renamed from ooo_custom_images/oxygen/svtools/res/ncollate_h.png) | bin | 393 -> 393 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/ooo_custom_images/hicontrast/vcl/res/closedoc.png b/ooo_custom_images/hicontrast/vcl/res/closedoc.png Binary files differnew file mode 100644 index 000000000000..1e5056275aae --- /dev/null +++ b/ooo_custom_images/hicontrast/vcl/res/closedoc.png diff --git a/ooo_custom_images/oxygen/svtools/res/collate_h.png b/ooo_custom_images/hicontrast/vcl/res/collate.png Binary files differindex f4dc23974343..f4dc23974343 100644 --- a/ooo_custom_images/oxygen/svtools/res/collate_h.png +++ b/ooo_custom_images/hicontrast/vcl/res/collate.png diff --git a/ooo_custom_images/hicontrast/vcl/res/msgbox.png b/ooo_custom_images/hicontrast/vcl/res/msgbox.png Binary files differnew file mode 100644 index 000000000000..d3f7429eef81 --- /dev/null +++ b/ooo_custom_images/hicontrast/vcl/res/msgbox.png diff --git a/ooo_custom_images/oxygen/svtools/res/ncollate_h.png b/ooo_custom_images/hicontrast/vcl/res/ncollate.png Binary files differindex dde8eba274fc..dde8eba274fc 100644 --- a/ooo_custom_images/oxygen/svtools/res/ncollate_h.png +++ b/ooo_custom_images/hicontrast/vcl/res/ncollate.png |
