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/res | |
| parent | Use meaningful names for shadow images. (diff) | |
| parent | CWS gnumake3: resync to m99 (diff) | |
| download | core-dcd3e3e493c68bf27f3cae1a8ab66628becba3b0.tar.gz core-dcd3e3e493c68bf27f3cae1a8ab66628becba3b0.zip | |
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/res')
| -rw-r--r-- | default_images/res/commandimagelist/lc_showannotations.png (renamed from default_images/res/commandimagelist/lc_showannotation.png) | bin | 611 -> 611 bytes |
| -rw-r--r-- | default_images/res/commandimagelist/sc_showannotations.png (renamed from default_images/res/commandimagelist/sc_showannotation.png) | bin | 382 -> 382 bytes |
| -rwxr-xr-x | default_images/res/commandimagelist/sch_showannotations.png | bin | 0 -> 3611 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/default_images/res/commandimagelist/lc_showannotation.png b/default_images/res/commandimagelist/lc_showannotations.png Binary files differindex 0d1b1cb8876c..0d1b1cb8876c 100644 --- a/default_images/res/commandimagelist/lc_showannotation.png +++ b/default_images/res/commandimagelist/lc_showannotations.png diff --git a/default_images/res/commandimagelist/sc_showannotation.png b/default_images/res/commandimagelist/sc_showannotations.png Binary files differindex d5e0d7616aa7..d5e0d7616aa7 100644 --- a/default_images/res/commandimagelist/sc_showannotation.png +++ b/default_images/res/commandimagelist/sc_showannotations.png diff --git a/default_images/res/commandimagelist/sch_showannotations.png b/default_images/res/commandimagelist/sch_showannotations.png Binary files differnew file mode 100755 index 000000000000..cd3155082eed --- /dev/null +++ b/default_images/res/commandimagelist/sch_showannotations.png |
