diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-07 23:59:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-07 23:59:09 +0100 |
| commit | 79345f9ca0fd6b641c90e1577120d70a2806d00c (patch) | |
| tree | 706e13dcd3cb9e30184ffee5a881ec66f4ffa480 /ooo_custom_images/hicontrast/res/sx03128.png | |
| parent | 8ae7ac04e3f64b8adb23eae14f398151d21fedd0 (diff) | |
| parent | 849279ed996d4f8dbdd2ce07cdd0fedcfb0fae1a (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
default_images/res/odb_32_hc.png
default_images/res/odf_32_hc.png
default_images/res/odg_32_hc.png
default_images/res/odp_32_hc.png
default_images/res/ods_32_hc.png
default_images/res/odt_32_hc.png
Diffstat (limited to 'ooo_custom_images/hicontrast/res/sx03128.png')
| -rw-r--r-- | ooo_custom_images/hicontrast/res/sx03128.png | bin | 155 -> 309 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/ooo_custom_images/hicontrast/res/sx03128.png b/ooo_custom_images/hicontrast/res/sx03128.png Binary files differindex aab4084168e2..39a721fcb24b 100644 --- a/ooo_custom_images/hicontrast/res/sx03128.png +++ b/ooo_custom_images/hicontrast/res/sx03128.png |
