diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-02-08 00:15:12 +0100 |
| commit | e1740510b7786803134411d9aa3a125642cf9fdc (patch) | |
| tree | 24b829557ce13acc23dbd4b3da25fb2e9726a0c5 /sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png | |
| parent | 06fc1ee4c4ee8de3a4d758cbca761a5e80a0873f (diff) | |
| parent | 99fe0a11ca01d9e7f10acc1e138a579457c2f004 (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sfx2/source/appl/appserv.cxx
Diffstat (limited to 'sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png')
| -rw-r--r-- | sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png | bin | 4919 -> 2087 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png Binary files differindex 655a938f826c..e4bec3bff9fd 100644 --- a/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png +++ b/sysui/desktop/icons/hicolor/48x48/mimetypes/oasis-drawing-template.png |
