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 /default_images | |
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 'default_images')
59 files changed, 0 insertions, 0 deletions
diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png Binary files differindex 6e6a95b81a68..309e8828c1b2 100644 --- a/default_images/res/lx03128.png +++ b/default_images/res/lx03128.png diff --git a/default_images/res/lx03139.png b/default_images/res/lx03139.png Binary files differindex cc6bd720a68d..c08fd88c0447 100644 --- a/default_images/res/lx03139.png +++ b/default_images/res/lx03139.png diff --git a/default_images/res/lx03216.png b/default_images/res/lx03216.png Binary files differindex 48bda3c0b625..176461a099d5 100644 --- a/default_images/res/lx03216.png +++ b/default_images/res/lx03216.png diff --git a/default_images/res/lx03242.png b/default_images/res/lx03242.png Binary files differindex 0474f5b0ea8a..dba5f4e030a7 100644 --- a/default_images/res/lx03242.png +++ b/default_images/res/lx03242.png diff --git a/default_images/res/lx03245.png b/default_images/res/lx03245.png Binary files differindex 078e304cdf28..549bcb7eea5c 100644 --- a/default_images/res/lx03245.png +++ b/default_images/res/lx03245.png diff --git a/default_images/res/lx03246.png b/default_images/res/lx03246.png Binary files differindex 2679e6e07e23..2e05ffe8e571 100644 --- a/default_images/res/lx03246.png +++ b/default_images/res/lx03246.png diff --git a/default_images/res/lx03247.png b/default_images/res/lx03247.png Binary files differindex 54e97b0ea56e..f392014275ee 100644 --- a/default_images/res/lx03247.png +++ b/default_images/res/lx03247.png diff --git a/default_images/res/lx03248.png b/default_images/res/lx03248.png Binary files differindex 072545641b8b..2cf6741bbfe3 100644 --- a/default_images/res/lx03248.png +++ b/default_images/res/lx03248.png diff --git a/default_images/res/lx03249.png b/default_images/res/lx03249.png Binary files differindex 8bf5c880f260..a046ed3fda9d 100644 --- a/default_images/res/lx03249.png +++ b/default_images/res/lx03249.png diff --git a/default_images/res/lx03250.png b/default_images/res/lx03250.png Binary files differindex 0a3e2b848fb3..162f69c44766 100644 --- a/default_images/res/lx03250.png +++ b/default_images/res/lx03250.png diff --git a/default_images/res/lx03251.png b/default_images/res/lx03251.png Binary files differindex 53b1a987a8fd..1942e73d021f 100644 --- a/default_images/res/lx03251.png +++ b/default_images/res/lx03251.png diff --git a/default_images/res/lx03252.png b/default_images/res/lx03252.png Binary files differindex 091b8ea35d81..3bd738714aee 100644 --- a/default_images/res/lx03252.png +++ b/default_images/res/lx03252.png diff --git a/default_images/res/lx03253.png b/default_images/res/lx03253.png Binary files differindex 11e00c498c7f..ea8579d40519 100644 --- a/default_images/res/lx03253.png +++ b/default_images/res/lx03253.png diff --git a/default_images/res/lx03254.png b/default_images/res/lx03254.png Binary files differindex 7910f4b0e6d4..0b2b6c537952 100644 --- a/default_images/res/lx03254.png +++ b/default_images/res/lx03254.png diff --git a/default_images/res/lx03255.png b/default_images/res/lx03255.png Binary files differindex 73721a0226ba..cfd3907193ee 100644 --- a/default_images/res/lx03255.png +++ b/default_images/res/lx03255.png diff --git a/default_images/res/odb_16_8.png b/default_images/res/odb_16_8.png Binary files differindex ef032681f093..3465f32dde01 100644 --- a/default_images/res/odb_16_8.png +++ b/default_images/res/odb_16_8.png diff --git a/default_images/res/odb_32.png b/default_images/res/odb_32.png Binary files differindex 399f2e5026fa..549bcb7eea5c 100644 --- a/default_images/res/odb_32.png +++ b/default_images/res/odb_32.png diff --git a/default_images/res/odb_32_8.png b/default_images/res/odb_32_8.png Binary files differindex f9de45288f18..549bcb7eea5c 100644 --- a/default_images/res/odb_32_8.png +++ b/default_images/res/odb_32_8.png diff --git a/default_images/res/odb_48_8.png b/default_images/res/odb_48_8.png Binary files differindex 0413e7fbd4ee..4851d31c5542 100644 --- a/default_images/res/odb_48_8.png +++ b/default_images/res/odb_48_8.png diff --git a/default_images/res/odf_16_8.png b/default_images/res/odf_16_8.png Binary files differindex a2559b137c82..ab945b1ecf88 100644 --- a/default_images/res/odf_16_8.png +++ b/default_images/res/odf_16_8.png diff --git a/default_images/res/odf_32.png b/default_images/res/odf_32.png Binary files differindex 54e97b0ea56e..f392014275ee 100644 --- a/default_images/res/odf_32.png +++ b/default_images/res/odf_32.png diff --git a/default_images/res/odf_32_8.png b/default_images/res/odf_32_8.png Binary files differindex 36791b0cd777..f392014275ee 100644 --- a/default_images/res/odf_32_8.png +++ b/default_images/res/odf_32_8.png diff --git a/default_images/res/odf_48_8.png b/default_images/res/odf_48_8.png Binary files differindex 03dda27d40e1..8e2c0a1c1b5d 100644 --- a/default_images/res/odf_48_8.png +++ b/default_images/res/odf_48_8.png diff --git a/default_images/res/odg_16_8.png b/default_images/res/odg_16_8.png Binary files differindex c18599ddb9af..94bc2aa8564b 100644 --- a/default_images/res/odg_16_8.png +++ b/default_images/res/odg_16_8.png diff --git a/default_images/res/odg_32.png b/default_images/res/odg_32.png Binary files differindex 2679e6e07e23..2e05ffe8e571 100644 --- a/default_images/res/odg_32.png +++ b/default_images/res/odg_32.png diff --git a/default_images/res/odg_32_8.png b/default_images/res/odg_32_8.png Binary files differindex 021ec5077d98..2e05ffe8e571 100644 --- a/default_images/res/odg_32_8.png +++ b/default_images/res/odg_32_8.png diff --git a/default_images/res/odg_48_8.png b/default_images/res/odg_48_8.png Binary files differindex 2c9089806181..56a835cf9cf1 100644 --- a/default_images/res/odg_48_8.png +++ b/default_images/res/odg_48_8.png diff --git a/default_images/res/odm_16_8.png b/default_images/res/odm_16_8.png Binary files differindex ffcb5ead489a..40777f7276dc 100644 --- a/default_images/res/odm_16_8.png +++ b/default_images/res/odm_16_8.png diff --git a/default_images/res/odm_32.png b/default_images/res/odm_32.png Binary files differnew file mode 100644 index 000000000000..2cf6741bbfe3 --- /dev/null +++ b/default_images/res/odm_32.png diff --git a/default_images/res/odm_32_8.png b/default_images/res/odm_32_8.png Binary files differindex fe9685b11c55..2cf6741bbfe3 100644 --- a/default_images/res/odm_32_8.png +++ b/default_images/res/odm_32_8.png diff --git a/default_images/res/odm_32_hc.png b/default_images/res/odm_32_hc.png Binary files differnew file mode 100644 index 000000000000..f1f98a6ecd3a --- /dev/null +++ b/default_images/res/odm_32_hc.png diff --git a/default_images/res/odm_48_8.png b/default_images/res/odm_48_8.png Binary files differindex e96f376e8b11..01bf4e91aa80 100644 --- a/default_images/res/odm_48_8.png +++ b/default_images/res/odm_48_8.png diff --git a/default_images/res/odp_16_8.png b/default_images/res/odp_16_8.png Binary files differindex a71bdfe1df42..75d94f0030ab 100644 --- a/default_images/res/odp_16_8.png +++ b/default_images/res/odp_16_8.png diff --git a/default_images/res/odp_32.png b/default_images/res/odp_32.png Binary files differindex cbc4d8f861f7..a046ed3fda9d 100644 --- a/default_images/res/odp_32.png +++ b/default_images/res/odp_32.png diff --git a/default_images/res/odp_32_8.png b/default_images/res/odp_32_8.png Binary files differindex 8d5318ef8cb1..a046ed3fda9d 100644 --- a/default_images/res/odp_32_8.png +++ b/default_images/res/odp_32_8.png diff --git a/default_images/res/odp_48_8.png b/default_images/res/odp_48_8.png Binary files differindex 0bdfa556b9ab..09bbb42baec0 100644 --- a/default_images/res/odp_48_8.png +++ b/default_images/res/odp_48_8.png diff --git a/default_images/res/ods_16_8.png b/default_images/res/ods_16_8.png Binary files differindex 421aff9e2e95..3f1f4ae93cc5 100644 --- a/default_images/res/ods_16_8.png +++ b/default_images/res/ods_16_8.png diff --git a/default_images/res/ods_32.png b/default_images/res/ods_32.png Binary files differindex 0a3e2b848fb3..162f69c44766 100644 --- a/default_images/res/ods_32.png +++ b/default_images/res/ods_32.png diff --git a/default_images/res/ods_32_8.png b/default_images/res/ods_32_8.png Binary files differindex 7db795362367..162f69c44766 100644 --- a/default_images/res/ods_32_8.png +++ b/default_images/res/ods_32_8.png diff --git a/default_images/res/ods_48_8.png b/default_images/res/ods_48_8.png Binary files differindex c5df896261c0..c3deeb0737a4 100644 --- a/default_images/res/ods_48_8.png +++ b/default_images/res/ods_48_8.png diff --git a/default_images/res/odt_16_8.png b/default_images/res/odt_16_8.png Binary files differindex 4c68f8cb7fdf..1aacbb52b5c0 100644 --- a/default_images/res/odt_16_8.png +++ b/default_images/res/odt_16_8.png diff --git a/default_images/res/odt_32.png b/default_images/res/odt_32.png Binary files differindex 8452a5cd6485..1942e73d021f 100644 --- a/default_images/res/odt_32.png +++ b/default_images/res/odt_32.png diff --git a/default_images/res/odt_32_8.png b/default_images/res/odt_32_8.png Binary files differindex 86f9d84f012f..1942e73d021f 100644 --- a/default_images/res/odt_32_8.png +++ b/default_images/res/odt_32_8.png diff --git a/default_images/res/odt_48_8.png b/default_images/res/odt_48_8.png Binary files differindex 8eddf1257027..37c931ce31b5 100644 --- a/default_images/res/odt_48_8.png +++ b/default_images/res/odt_48_8.png diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png Binary files differindex c4cdc7abd2f4..a24df733d4ff 100644 --- a/default_images/res/sx03128.png +++ b/default_images/res/sx03128.png diff --git a/default_images/res/sx03139.png b/default_images/res/sx03139.png Binary files differindex 1665446fea55..16bf02e1b5b2 100644 --- a/default_images/res/sx03139.png +++ b/default_images/res/sx03139.png diff --git a/default_images/res/sx03216.png b/default_images/res/sx03216.png Binary files differindex 998c86ba8718..35968bb7cf22 100644 --- a/default_images/res/sx03216.png +++ b/default_images/res/sx03216.png diff --git a/default_images/res/sx03242.png b/default_images/res/sx03242.png Binary files differindex 5fc94a934cc3..2459b2a5d6dc 100644 --- a/default_images/res/sx03242.png +++ b/default_images/res/sx03242.png diff --git a/default_images/res/sx03245.png b/default_images/res/sx03245.png Binary files differindex 23abf99a3043..3465f32dde01 100644 --- a/default_images/res/sx03245.png +++ b/default_images/res/sx03245.png diff --git a/default_images/res/sx03246.png b/default_images/res/sx03246.png Binary files differindex 486690389a1d..94bc2aa8564b 100644 --- a/default_images/res/sx03246.png +++ b/default_images/res/sx03246.png diff --git a/default_images/res/sx03247.png b/default_images/res/sx03247.png Binary files differindex 82e939ece6f3..ab945b1ecf88 100644 --- a/default_images/res/sx03247.png +++ b/default_images/res/sx03247.png diff --git a/default_images/res/sx03248.png b/default_images/res/sx03248.png Binary files differindex 9f0e3beaa503..40777f7276dc 100644 --- a/default_images/res/sx03248.png +++ b/default_images/res/sx03248.png diff --git a/default_images/res/sx03249.png b/default_images/res/sx03249.png Binary files differindex 52a2867c55bd..75d94f0030ab 100644 --- a/default_images/res/sx03249.png +++ b/default_images/res/sx03249.png diff --git a/default_images/res/sx03250.png b/default_images/res/sx03250.png Binary files differindex 25ff2a9ff02d..3f1f4ae93cc5 100644 --- a/default_images/res/sx03250.png +++ b/default_images/res/sx03250.png diff --git a/default_images/res/sx03251.png b/default_images/res/sx03251.png Binary files differindex 382ef406b602..1aacbb52b5c0 100644 --- a/default_images/res/sx03251.png +++ b/default_images/res/sx03251.png diff --git a/default_images/res/sx03252.png b/default_images/res/sx03252.png Binary files differindex 45d144bd2259..456b8108b6e3 100644 --- a/default_images/res/sx03252.png +++ b/default_images/res/sx03252.png diff --git a/default_images/res/sx03253.png b/default_images/res/sx03253.png Binary files differindex 8a134771d8d3..99d38d75afbb 100644 --- a/default_images/res/sx03253.png +++ b/default_images/res/sx03253.png diff --git a/default_images/res/sx03254.png b/default_images/res/sx03254.png Binary files differindex 102e0bbf1788..74c312c2724d 100644 --- a/default_images/res/sx03254.png +++ b/default_images/res/sx03254.png diff --git a/default_images/res/sx03255.png b/default_images/res/sx03255.png Binary files differindex 6483f982c80f..9d7c277546fd 100644 --- a/default_images/res/sx03255.png +++ b/default_images/res/sx03255.png |