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/brand | |
| 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/brand')
19 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 |
