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/framework | |
| 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/framework')
| -rw-r--r-- | default_images/framework/res/backing.png | bin | 12240 -> 19498 bytes |
| -rw-r--r-- | default_images/framework/res/backing_right.png | bin | 4856 -> 6396 bytes |
| -rw-r--r-- | default_images/framework/res/backing_rtl_left.png | bin | 12237 -> 19498 bytes |
| -rw-r--r-- | default_images/framework/res/backing_rtl_right.png | bin | 4878 -> 6396 bytes |
| -rw-r--r-- | default_images/framework/res/backing_space.png | bin | 188 -> 336 bytes |
5 files changed, 0 insertions, 0 deletions
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 |
