diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-11 10:27:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-11 10:27:18 +0100 |
| commit | dcd3e3e493c68bf27f3cae1a8ab66628becba3b0 (patch) | |
| tree | a283ef3dbeebac96aab5c999fa6b91f1fa9bcfbc /default_images/svx | |
| parent | e929d0d00c39a298bff3cee1db991a4d88c9e527 (diff) | |
| parent | 43fc6767f0779bdfa9c2a75f9c38387b7874bae2 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
default_images/res/commandimagelist/lch_showannotations.png
default_images/shared/spinner-16-06.png
default_images/svx/res/cropmarkersACC.png
default_images/svx/res/markersACC.png
default_images/svx/source/svdraw/cropmarkersACC.png
default_images/svx/source/svdraw/markersACC.png
default_images/toolkit/source/awt/spinner03-32-hc_01.png
default_images/toolkit/source/awt/spinner03-32-hc_02.png
default_images/toolkit/source/awt/spinner03-32-hc_03.png
default_images/toolkit/source/awt/spinner03-32-hc_04.png
default_images/toolkit/source/awt/spinner03-32-hc_05.png
default_images/toolkit/source/awt/spinner03-32-hc_06.png
default_images/toolkit/source/awt/spinner03-32-hc_07.png
default_images/toolkit/source/awt/spinner03-32-hc_08.png
default_images/toolkit/source/awt/spinner03-32-hc_09.png
default_images/toolkit/source/awt/spinner03-32-hc_10.png
default_images/toolkit/source/awt/spinner03-32-hc_11.png
default_images/toolkit/source/awt/spinner03-32-hc_12.png
default_images/toolkit/tk/spinner03-32-hc_01.png
default_images/toolkit/tk/spinner03-32-hc_02.png
default_images/toolkit/tk/spinner03-32-hc_03.png
default_images/toolkit/tk/spinner03-32-hc_04.png
default_images/toolkit/tk/spinner03-32-hc_05.png
default_images/toolkit/tk/spinner03-32-hc_06.png
default_images/toolkit/tk/spinner03-32-hc_07.png
default_images/toolkit/tk/spinner03-32-hc_08.png
default_images/toolkit/tk/spinner03-32-hc_09.png
default_images/toolkit/tk/spinner03-32-hc_10.png
default_images/toolkit/tk/spinner03-32-hc_11.png
default_images/toolkit/tk/spinner03-32-hc_12.png
ooo_custom_images/oxygen/svx/source/svdraw/cropmarkersACC.png
ooo_custom_images/oxygen/svx/source/svdraw/markersACC.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_01.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_02.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_03.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_04.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_05.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_06.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_07.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_08.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_09.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_10.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_11.png
ooo_custom_images/oxygen/toolkit/source/awt/spinner03-32-hc_12.png
Diffstat (limited to 'default_images/svx')
| -rw-r--r-- | default_images/svx/res/cropmarkers.png (renamed from default_images/svx/source/svdraw/cropmarkers.png) | bin | 239 -> 239 bytes |
| -rw-r--r-- | default_images/svx/res/cropmarkers2.png (renamed from default_images/svx/source/svdraw/cropmarkers2.png) | bin | 348 -> 348 bytes |
| -rw-r--r-- | default_images/svx/res/markers.png (renamed from default_images/svx/source/svdraw/markers.png) | bin | 1208 -> 1208 bytes |
| -rw-r--r-- | default_images/svx/res/markers2.png (renamed from default_images/svx/source/svdraw/markers2.png) | bin | 2250 -> 2250 bytes |
| -rw-r--r-- | default_images/svx/res/pageshadow35x35.png | bin | 0 -> 708 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/default_images/svx/source/svdraw/cropmarkers.png b/default_images/svx/res/cropmarkers.png Binary files differindex 8c3b6cd79951..8c3b6cd79951 100644 --- a/default_images/svx/source/svdraw/cropmarkers.png +++ b/default_images/svx/res/cropmarkers.png diff --git a/default_images/svx/source/svdraw/cropmarkers2.png b/default_images/svx/res/cropmarkers2.png Binary files differindex c37736f086a0..c37736f086a0 100644 --- a/default_images/svx/source/svdraw/cropmarkers2.png +++ b/default_images/svx/res/cropmarkers2.png diff --git a/default_images/svx/source/svdraw/markers.png b/default_images/svx/res/markers.png Binary files differindex 6b19db877a8f..6b19db877a8f 100644 --- a/default_images/svx/source/svdraw/markers.png +++ b/default_images/svx/res/markers.png diff --git a/default_images/svx/source/svdraw/markers2.png b/default_images/svx/res/markers2.png Binary files differindex 0a69bbecd1ab..0a69bbecd1ab 100644 --- a/default_images/svx/source/svdraw/markers2.png +++ b/default_images/svx/res/markers2.png diff --git a/default_images/svx/res/pageshadow35x35.png b/default_images/svx/res/pageshadow35x35.png Binary files differnew file mode 100644 index 000000000000..1f0126e34075 --- /dev/null +++ b/default_images/svx/res/pageshadow35x35.png |
