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 /ooo_custom_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 'ooo_custom_images')
32 files changed, 0 insertions, 0 deletions
diff --git a/ooo_custom_images/hicontrast/res/lx03128.png b/ooo_custom_images/hicontrast/res/lx03128.png Binary files differindex 0156d75247b3..8e3097ea5c7e 100644 --- a/ooo_custom_images/hicontrast/res/lx03128.png +++ b/ooo_custom_images/hicontrast/res/lx03128.png diff --git a/ooo_custom_images/hicontrast/res/lx03139.png b/ooo_custom_images/hicontrast/res/lx03139.png Binary files differindex 6f3a85a9fea0..1cd3a80be4a8 100644 --- a/ooo_custom_images/hicontrast/res/lx03139.png +++ b/ooo_custom_images/hicontrast/res/lx03139.png diff --git a/ooo_custom_images/hicontrast/res/lx03216.png b/ooo_custom_images/hicontrast/res/lx03216.png Binary files differindex 58180abe41fe..537b05b60168 100644 --- a/ooo_custom_images/hicontrast/res/lx03216.png +++ b/ooo_custom_images/hicontrast/res/lx03216.png diff --git a/ooo_custom_images/hicontrast/res/lx03241.png b/ooo_custom_images/hicontrast/res/lx03241.png Binary files differindex 6795eee8dd0f..e96e85722c37 100644 --- a/ooo_custom_images/hicontrast/res/lx03241.png +++ b/ooo_custom_images/hicontrast/res/lx03241.png diff --git a/ooo_custom_images/hicontrast/res/lx03242.png b/ooo_custom_images/hicontrast/res/lx03242.png Binary files differindex a6c8bb645ca6..074e49d92fa6 100644 --- a/ooo_custom_images/hicontrast/res/lx03242.png +++ b/ooo_custom_images/hicontrast/res/lx03242.png diff --git a/ooo_custom_images/hicontrast/res/lx03245.png b/ooo_custom_images/hicontrast/res/lx03245.png Binary files differindex 8b58b0694dc8..5a0d3e219641 100644 --- a/ooo_custom_images/hicontrast/res/lx03245.png +++ b/ooo_custom_images/hicontrast/res/lx03245.png diff --git a/ooo_custom_images/hicontrast/res/lx03246.png b/ooo_custom_images/hicontrast/res/lx03246.png Binary files differindex a1c970d06c03..a0b1087555d0 100644 --- a/ooo_custom_images/hicontrast/res/lx03246.png +++ b/ooo_custom_images/hicontrast/res/lx03246.png diff --git a/ooo_custom_images/hicontrast/res/lx03247.png b/ooo_custom_images/hicontrast/res/lx03247.png Binary files differindex 7ed24c92c6b9..ba5a1fa6b52c 100644 --- a/ooo_custom_images/hicontrast/res/lx03247.png +++ b/ooo_custom_images/hicontrast/res/lx03247.png diff --git a/ooo_custom_images/hicontrast/res/lx03248.png b/ooo_custom_images/hicontrast/res/lx03248.png Binary files differindex 094141626cb3..ac10bb5aeacb 100644 --- a/ooo_custom_images/hicontrast/res/lx03248.png +++ b/ooo_custom_images/hicontrast/res/lx03248.png diff --git a/ooo_custom_images/hicontrast/res/lx03249.png b/ooo_custom_images/hicontrast/res/lx03249.png Binary files differindex 7b5b405da531..b4cdbcb2f382 100644 --- a/ooo_custom_images/hicontrast/res/lx03249.png +++ b/ooo_custom_images/hicontrast/res/lx03249.png diff --git a/ooo_custom_images/hicontrast/res/lx03250.png b/ooo_custom_images/hicontrast/res/lx03250.png Binary files differindex 51f8f41b02e8..f5fbe6809960 100644 --- a/ooo_custom_images/hicontrast/res/lx03250.png +++ b/ooo_custom_images/hicontrast/res/lx03250.png diff --git a/ooo_custom_images/hicontrast/res/lx03251.png b/ooo_custom_images/hicontrast/res/lx03251.png Binary files differindex d3172e389e9e..92ec34065b85 100644 --- a/ooo_custom_images/hicontrast/res/lx03251.png +++ b/ooo_custom_images/hicontrast/res/lx03251.png diff --git a/ooo_custom_images/hicontrast/res/lx03252.png b/ooo_custom_images/hicontrast/res/lx03252.png Binary files differindex b9a4537e6e38..ded6b968d1d9 100644 --- a/ooo_custom_images/hicontrast/res/lx03252.png +++ b/ooo_custom_images/hicontrast/res/lx03252.png diff --git a/ooo_custom_images/hicontrast/res/lx03253.png b/ooo_custom_images/hicontrast/res/lx03253.png Binary files differindex ac03af3dcb75..cbb4ff2d20ba 100644 --- a/ooo_custom_images/hicontrast/res/lx03253.png +++ b/ooo_custom_images/hicontrast/res/lx03253.png diff --git a/ooo_custom_images/hicontrast/res/lx03254.png b/ooo_custom_images/hicontrast/res/lx03254.png Binary files differindex b0b631430966..2d3e95f2f715 100644 --- a/ooo_custom_images/hicontrast/res/lx03254.png +++ b/ooo_custom_images/hicontrast/res/lx03254.png diff --git a/ooo_custom_images/hicontrast/res/lx03255.png b/ooo_custom_images/hicontrast/res/lx03255.png Binary files differindex 12313d75cf40..c77dfd7c98e1 100644 --- a/ooo_custom_images/hicontrast/res/lx03255.png +++ b/ooo_custom_images/hicontrast/res/lx03255.png diff --git a/ooo_custom_images/hicontrast/res/sx03128.png b/ooo_custom_images/hicontrast/res/sx03128.png Binary files differindex 7e6ecb41db6f..aab4084168e2 100644 --- a/ooo_custom_images/hicontrast/res/sx03128.png +++ b/ooo_custom_images/hicontrast/res/sx03128.png diff --git a/ooo_custom_images/hicontrast/res/sx03139.png b/ooo_custom_images/hicontrast/res/sx03139.png Binary files differindex e205d578eb87..d45a98da9645 100644 --- a/ooo_custom_images/hicontrast/res/sx03139.png +++ b/ooo_custom_images/hicontrast/res/sx03139.png diff --git a/ooo_custom_images/hicontrast/res/sx03216.png b/ooo_custom_images/hicontrast/res/sx03216.png Binary files differindex 6a2689d03ff4..f432516540fb 100644 --- a/ooo_custom_images/hicontrast/res/sx03216.png +++ b/ooo_custom_images/hicontrast/res/sx03216.png diff --git a/ooo_custom_images/hicontrast/res/sx03241.png b/ooo_custom_images/hicontrast/res/sx03241.png Binary files differindex c32d26971bbc..82c928be5251 100644 --- a/ooo_custom_images/hicontrast/res/sx03241.png +++ b/ooo_custom_images/hicontrast/res/sx03241.png diff --git a/ooo_custom_images/hicontrast/res/sx03242.png b/ooo_custom_images/hicontrast/res/sx03242.png Binary files differindex e39095e7c572..2881221174af 100644 --- a/ooo_custom_images/hicontrast/res/sx03242.png +++ b/ooo_custom_images/hicontrast/res/sx03242.png diff --git a/ooo_custom_images/hicontrast/res/sx03245.png b/ooo_custom_images/hicontrast/res/sx03245.png Binary files differindex 71891164e16a..00078c2faa83 100644 --- a/ooo_custom_images/hicontrast/res/sx03245.png +++ b/ooo_custom_images/hicontrast/res/sx03245.png diff --git a/ooo_custom_images/hicontrast/res/sx03246.png b/ooo_custom_images/hicontrast/res/sx03246.png Binary files differindex 301f66df8344..140d386b67ac 100644 --- a/ooo_custom_images/hicontrast/res/sx03246.png +++ b/ooo_custom_images/hicontrast/res/sx03246.png diff --git a/ooo_custom_images/hicontrast/res/sx03247.png b/ooo_custom_images/hicontrast/res/sx03247.png Binary files differindex e9ab1ae12d31..bada43d8861c 100644 --- a/ooo_custom_images/hicontrast/res/sx03247.png +++ b/ooo_custom_images/hicontrast/res/sx03247.png diff --git a/ooo_custom_images/hicontrast/res/sx03248.png b/ooo_custom_images/hicontrast/res/sx03248.png Binary files differindex 1d242c98b1b4..c301db7d81b4 100644 --- a/ooo_custom_images/hicontrast/res/sx03248.png +++ b/ooo_custom_images/hicontrast/res/sx03248.png diff --git a/ooo_custom_images/hicontrast/res/sx03249.png b/ooo_custom_images/hicontrast/res/sx03249.png Binary files differindex a52d19c0e0d7..2b65a397229c 100644 --- a/ooo_custom_images/hicontrast/res/sx03249.png +++ b/ooo_custom_images/hicontrast/res/sx03249.png diff --git a/ooo_custom_images/hicontrast/res/sx03250.png b/ooo_custom_images/hicontrast/res/sx03250.png Binary files differindex 43bc76a45334..825aa29827b2 100644 --- a/ooo_custom_images/hicontrast/res/sx03250.png +++ b/ooo_custom_images/hicontrast/res/sx03250.png diff --git a/ooo_custom_images/hicontrast/res/sx03251.png b/ooo_custom_images/hicontrast/res/sx03251.png Binary files differindex da481549fb97..73a8ffb2af79 100644 --- a/ooo_custom_images/hicontrast/res/sx03251.png +++ b/ooo_custom_images/hicontrast/res/sx03251.png diff --git a/ooo_custom_images/hicontrast/res/sx03252.png b/ooo_custom_images/hicontrast/res/sx03252.png Binary files differindex 7ac05d5d894d..3d8eb908bb3c 100644 --- a/ooo_custom_images/hicontrast/res/sx03252.png +++ b/ooo_custom_images/hicontrast/res/sx03252.png diff --git a/ooo_custom_images/hicontrast/res/sx03253.png b/ooo_custom_images/hicontrast/res/sx03253.png Binary files differindex 046f224cea0f..26fa1e92566c 100644 --- a/ooo_custom_images/hicontrast/res/sx03253.png +++ b/ooo_custom_images/hicontrast/res/sx03253.png diff --git a/ooo_custom_images/hicontrast/res/sx03254.png b/ooo_custom_images/hicontrast/res/sx03254.png Binary files differindex abebaa1ba92c..9921b08cda5c 100644 --- a/ooo_custom_images/hicontrast/res/sx03254.png +++ b/ooo_custom_images/hicontrast/res/sx03254.png diff --git a/ooo_custom_images/hicontrast/res/sx03255.png b/ooo_custom_images/hicontrast/res/sx03255.png Binary files differindex 808603278c55..ead7271a3742 100644 --- a/ooo_custom_images/hicontrast/res/sx03255.png +++ b/ooo_custom_images/hicontrast/res/sx03255.png |
