diff options
author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:37 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:15:37 +0100 |
commit | 0813b692750ee4b190503ea825b201da7a5ff3ed (patch) | |
tree | 39daf94da6ee08686b5534615abb4af80577394a /default_images | |
parent | af1ac5c3f5b1709551e910f1cf01e48a529ecd75 (diff) | |
parent | 4d3d7d00b6a134a4f42dca7f86c6053bc77f3d38 (diff) |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
default_images/brand/shell/backing_hc-pt_BR.png
default_images/brand/shell/backing_hc.png
default_images/brand/shell/backing_right_hc-pt_BR.png
default_images/brand/shell/backing_right_hc.png
default_images/brand/shell/backing_rtl_left_hc.png
default_images/brand/shell/backing_rtl_right_hc.png
default_images/brand/shell/backing_space_hc.png
default_images/framework/res/backing_hc.png
default_images/framework/res/backing_right_hc.png
default_images/framework/res/backing_rtl_left_hc.png
default_images/framework/res/backing_rtl_right_hc.png
default_images/framework/res/backing_space_hc.png
default_images/introabout/about.bmp
default_images/introabout/about.png
default_images/introabout/intro.bmp
default_images/introabout/intro.png
Diffstat (limited to 'default_images')
54 files changed, 0 insertions, 0 deletions
diff --git a/default_images/brand/about-pt_BR.png b/default_images/brand/about-pt_BR.png Binary files differindex 2c024598a5e7..36755c0a2194 100644 --- a/default_images/brand/about-pt_BR.png +++ b/default_images/brand/about-pt_BR.png diff --git a/default_images/brand/about.png b/default_images/brand/about.png Binary files differindex 315221594da0..3520c50275ff 100755 --- a/default_images/brand/about.png +++ b/default_images/brand/about.png diff --git a/default_images/brand/intro-pt_BR.png b/default_images/brand/intro-pt_BR.png Binary files differindex 1dcb76dd227a..6a00c401fca2 100644 --- a/default_images/brand/intro-pt_BR.png +++ b/default_images/brand/intro-pt_BR.png diff --git a/default_images/brand/intro.png b/default_images/brand/intro.png Binary files differindex 26be4214e9b1..a7756270a309 100755 --- a/default_images/brand/intro.png +++ b/default_images/brand/intro.png diff --git a/default_images/brand/shell/backing-pt_BR.png b/default_images/brand/shell/backing-pt_BR.png Binary files differnew file mode 100644 index 000000000000..8cccbef35146 --- /dev/null +++ b/default_images/brand/shell/backing-pt_BR.png diff --git a/default_images/brand/shell/backing.png b/default_images/brand/shell/backing.png Binary files differnew file mode 100644 index 000000000000..4b830ba70bed --- /dev/null +++ b/default_images/brand/shell/backing.png diff --git a/default_images/brand/shell/backing_left-pt_BR.png b/default_images/brand/shell/backing_left-pt_BR.png Binary files differindex c023ea7759f8..8cccbef35146 100644 --- a/default_images/brand/shell/backing_left-pt_BR.png +++ b/default_images/brand/shell/backing_left-pt_BR.png diff --git a/default_images/brand/shell/backing_left.png b/default_images/brand/shell/backing_left.png Binary files differindex b975b84ac34a..4b830ba70bed 100644 --- a/default_images/brand/shell/backing_left.png +++ b/default_images/brand/shell/backing_left.png diff --git a/default_images/brand/shell/backing_left_hc-pt_BR.png b/default_images/brand/shell/backing_left_hc-pt_BR.png Binary files differnew file mode 100644 index 000000000000..8cccbef35146 --- /dev/null +++ b/default_images/brand/shell/backing_left_hc-pt_BR.png diff --git a/default_images/brand/shell/backing_left_hc.png b/default_images/brand/shell/backing_left_hc.png Binary files differnew file mode 100644 index 000000000000..4b830ba70bed --- /dev/null +++ b/default_images/brand/shell/backing_left_hc.png diff --git a/default_images/brand/shell/backing_right-pt_BR.png b/default_images/brand/shell/backing_right-pt_BR.png Binary files differindex e16bf9637f87..b95e877772ac 100644 --- a/default_images/brand/shell/backing_right-pt_BR.png +++ b/default_images/brand/shell/backing_right-pt_BR.png diff --git a/default_images/brand/shell/backing_right.png b/default_images/brand/shell/backing_right.png Binary files differindex e16bf9637f87..b95e877772ac 100644 --- a/default_images/brand/shell/backing_right.png +++ b/default_images/brand/shell/backing_right.png diff --git a/default_images/brand/shell/backing_rtl_left-pt_BR.png b/default_images/brand/shell/backing_rtl_left-pt_BR.png Binary files differnew file mode 100644 index 000000000000..8cccbef35146 --- /dev/null +++ b/default_images/brand/shell/backing_rtl_left-pt_BR.png diff --git a/default_images/brand/shell/backing_rtl_left.png b/default_images/brand/shell/backing_rtl_left.png Binary files differindex b975b84ac34a..8cccbef35146 100644 --- a/default_images/brand/shell/backing_rtl_left.png +++ b/default_images/brand/shell/backing_rtl_left.png diff --git a/default_images/brand/shell/backing_rtl_left_hc-pt_BR.png b/default_images/brand/shell/backing_rtl_left_hc-pt_BR.png Binary files differnew file mode 100644 index 000000000000..8cccbef35146 --- /dev/null +++ b/default_images/brand/shell/backing_rtl_left_hc-pt_BR.png diff --git a/default_images/brand/shell/backing_rtl_right-pt_BR.png b/default_images/brand/shell/backing_rtl_right-pt_BR.png Binary files differnew file mode 100644 index 000000000000..b95e877772ac --- /dev/null +++ b/default_images/brand/shell/backing_rtl_right-pt_BR.png diff --git a/default_images/brand/shell/backing_rtl_right.png b/default_images/brand/shell/backing_rtl_right.png Binary files differindex e16bf9637f87..b95e877772ac 100644 --- a/default_images/brand/shell/backing_rtl_right.png +++ b/default_images/brand/shell/backing_rtl_right.png diff --git a/default_images/brand/shell/backing_rtl_right_hc-pt_BR.png b/default_images/brand/shell/backing_rtl_right_hc-pt_BR.png Binary files differnew file mode 100644 index 000000000000..b95e877772ac --- /dev/null +++ b/default_images/brand/shell/backing_rtl_right_hc-pt_BR.png diff --git a/default_images/brand/shell/backing_space.png b/default_images/brand/shell/backing_space.png Binary files differindex c81dcc3df7cb..1f3060cc3723 100644 --- a/default_images/brand/shell/backing_space.png +++ b/default_images/brand/shell/backing_space.png diff --git a/default_images/framework/res/backing.png b/default_images/framework/res/backing.png Binary files differindex d21aa67ac89b..4b830ba70bed 100644 --- a/default_images/framework/res/backing.png +++ b/default_images/framework/res/backing.png diff --git a/default_images/framework/res/backing_right.png b/default_images/framework/res/backing_right.png Binary files differindex e745f5c33156..b95e877772ac 100644 --- a/default_images/framework/res/backing_right.png +++ b/default_images/framework/res/backing_right.png diff --git a/default_images/framework/res/backing_rtl_left.png b/default_images/framework/res/backing_rtl_left.png Binary files differindex 9be54b8d9dcd..4b830ba70bed 100644 --- a/default_images/framework/res/backing_rtl_left.png +++ b/default_images/framework/res/backing_rtl_left.png diff --git a/default_images/framework/res/backing_rtl_right.png b/default_images/framework/res/backing_rtl_right.png Binary files differindex 99c9a2baa89a..b95e877772ac 100644 --- a/default_images/framework/res/backing_rtl_right.png +++ b/default_images/framework/res/backing_rtl_right.png diff --git a/default_images/framework/res/backing_space.png b/default_images/framework/res/backing_space.png Binary files differindex f2676d894f55..1f3060cc3723 100644 --- a/default_images/framework/res/backing_space.png +++ b/default_images/framework/res/backing_space.png diff --git a/default_images/res/lx03128.png b/default_images/res/lx03128.png Binary files differindex d077510b7e10..6e6a95b81a68 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 802b0c1b002f..cc6bd720a68d 100644 --- a/default_images/res/lx03139.png +++ b/default_images/res/lx03139.png diff --git a/default_images/res/lx03241.png b/default_images/res/lx03241.png Binary files differindex d077510b7e10..2ae05479910e 100644 --- a/default_images/res/lx03241.png +++ b/default_images/res/lx03241.png diff --git a/default_images/res/lx03242.png b/default_images/res/lx03242.png Binary files differindex 06e4a252aa7e..0474f5b0ea8a 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 d4e6dc462a8b..078e304cdf28 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 a50faf1d0b0b..2679e6e07e23 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 dfd89c99b186..54e97b0ea56e 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 d588cde4fac0..072545641b8b 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 c813e23b3f3d..8bf5c880f260 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 45140117552c..0a3e2b848fb3 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 6740fb40dd5a..53b1a987a8fd 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 2b9cbe3f0898..091b8ea35d81 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 19202956d6b3..11e00c498c7f 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 9eec7df2dfde..7910f4b0e6d4 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 a70f4b4df7d6..73721a0226ba 100644 --- a/default_images/res/lx03255.png +++ b/default_images/res/lx03255.png diff --git a/default_images/res/sx03128.png b/default_images/res/sx03128.png Binary files differindex eb6c57c1382b..c4cdc7abd2f4 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 4cf2ed222673..1665446fea55 100644 --- a/default_images/res/sx03139.png +++ b/default_images/res/sx03139.png diff --git a/default_images/res/sx03241.png b/default_images/res/sx03241.png Binary files differindex eb6c57c1382b..222f8c1dff70 100644 --- a/default_images/res/sx03241.png +++ b/default_images/res/sx03241.png diff --git a/default_images/res/sx03242.png b/default_images/res/sx03242.png Binary files differindex 80db87c0fa8a..5fc94a934cc3 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 51a6736c0bc4..23abf99a3043 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 49f01cfedf1f..486690389a1d 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 268898d1c659..82e939ece6f3 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 757b0b680891..9f0e3beaa503 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 cff0264c0a9e..52a2867c55bd 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 a2e90fbd10d5..25ff2a9ff02d 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 095c894049dc..382ef406b602 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 4bb2bfe6d20b..45d144bd2259 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 cd2bc6bb9816..8a134771d8d3 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 d5a49955f457..102e0bbf1788 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 7b922f1d5ccf..6483f982c80f 100644 --- a/default_images/res/sx03255.png +++ b/default_images/res/sx03255.png |