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/intro.png | |
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/intro.png')
-rwxr-xr-x | default_images/brand/intro.png | bin | 24676 -> 31528 bytes |
1 files changed, 0 insertions, 0 deletions
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 |