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/toolkit | |
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/toolkit')
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_01.png (renamed from default_images/toolkit/source/awt/spinner03-grey_01.png) | bin | 260 -> 260 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_02.png (renamed from default_images/toolkit/source/awt/spinner03-grey_02.png) | bin | 262 -> 262 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_03.png (renamed from default_images/toolkit/source/awt/spinner03-grey_03.png) | bin | 264 -> 264 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_04.png (renamed from default_images/toolkit/source/awt/spinner03-grey_04.png) | bin | 266 -> 266 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_05.png (renamed from default_images/toolkit/source/awt/spinner03-grey_05.png) | bin | 265 -> 265 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_06.png (renamed from default_images/toolkit/source/awt/spinner03-grey_06.png) | bin | 266 -> 266 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_07.png (renamed from default_images/toolkit/source/awt/spinner03-grey_07.png) | bin | 267 -> 267 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_08.png (renamed from default_images/toolkit/source/awt/spinner03-grey_08.png) | bin | 262 -> 262 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_09.png (renamed from default_images/toolkit/source/awt/spinner03-grey_09.png) | bin | 261 -> 261 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_10.png (renamed from default_images/toolkit/source/awt/spinner03-grey_10.png) | bin | 260 -> 260 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_11.png (renamed from default_images/toolkit/source/awt/spinner03-grey_11.png) | bin | 259 -> 259 bytes |
-rw-r--r-- | default_images/toolkit/tk/spinner03-grey_12.png (renamed from default_images/toolkit/source/awt/spinner03-grey_12.png) | bin | 264 -> 264 bytes |
12 files changed, 0 insertions, 0 deletions
diff --git a/default_images/toolkit/source/awt/spinner03-grey_01.png b/default_images/toolkit/tk/spinner03-grey_01.png Binary files differindex 255688698e4b..255688698e4b 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_01.png +++ b/default_images/toolkit/tk/spinner03-grey_01.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_02.png b/default_images/toolkit/tk/spinner03-grey_02.png Binary files differindex 4256d331cca6..4256d331cca6 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_02.png +++ b/default_images/toolkit/tk/spinner03-grey_02.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_03.png b/default_images/toolkit/tk/spinner03-grey_03.png Binary files differindex f5c1cb520b0b..f5c1cb520b0b 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_03.png +++ b/default_images/toolkit/tk/spinner03-grey_03.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_04.png b/default_images/toolkit/tk/spinner03-grey_04.png Binary files differindex abce90a19ac5..abce90a19ac5 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_04.png +++ b/default_images/toolkit/tk/spinner03-grey_04.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_05.png b/default_images/toolkit/tk/spinner03-grey_05.png Binary files differindex 1494ea5fc0f3..1494ea5fc0f3 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_05.png +++ b/default_images/toolkit/tk/spinner03-grey_05.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_06.png b/default_images/toolkit/tk/spinner03-grey_06.png Binary files differindex 3a7f7b12f530..3a7f7b12f530 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_06.png +++ b/default_images/toolkit/tk/spinner03-grey_06.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_07.png b/default_images/toolkit/tk/spinner03-grey_07.png Binary files differindex 2e86fcb21155..2e86fcb21155 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_07.png +++ b/default_images/toolkit/tk/spinner03-grey_07.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_08.png b/default_images/toolkit/tk/spinner03-grey_08.png Binary files differindex f5a7d8e4055e..f5a7d8e4055e 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_08.png +++ b/default_images/toolkit/tk/spinner03-grey_08.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_09.png b/default_images/toolkit/tk/spinner03-grey_09.png Binary files differindex 5411eb6553d9..5411eb6553d9 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_09.png +++ b/default_images/toolkit/tk/spinner03-grey_09.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_10.png b/default_images/toolkit/tk/spinner03-grey_10.png Binary files differindex 2737c3f2f39a..2737c3f2f39a 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_10.png +++ b/default_images/toolkit/tk/spinner03-grey_10.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_11.png b/default_images/toolkit/tk/spinner03-grey_11.png Binary files differindex fb7794bd29b8..fb7794bd29b8 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_11.png +++ b/default_images/toolkit/tk/spinner03-grey_11.png diff --git a/default_images/toolkit/source/awt/spinner03-grey_12.png b/default_images/toolkit/tk/spinner03-grey_12.png Binary files differindex 9a12cf484fb3..9a12cf484fb3 100644 --- a/default_images/toolkit/source/awt/spinner03-grey_12.png +++ b/default_images/toolkit/tk/spinner03-grey_12.png |