diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 23:53:37 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-03-09 23:53:37 -0600 |
| commit | 34a046f346d564aacb43f08a6b49e4703990315c (patch) | |
| tree | a787be54e81a50bf842e0cede41a316d191d2ae7 | |
| parent | 7e2f583b3fd22899304feb4acea951e455aa168b (diff) | |
| parent | 1bbffcffe00fee97db8e40e07da74039fd02ccb4 (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101integration/dev300_m101
* commit 'ooo/DEV300_m101':
impressdefaults1: #i113015# #i113017# new defaults for shape filling, outline and shadows
impress202: #i35600# fixed some shape outlines (flower shape)
impress202: #i35600# fixed heart + puzzle shape..
Conflicts:
extras/source/palettes/standard.soc
| -rw-r--r-- | extras/source/gallery/gallery_system/sg24.sdg | bin | 49161 -> 45786 bytes | |||
| -rw-r--r-- | extras/source/gallery/gallery_system/sg24.sdv | bin | 359424 -> 360960 bytes | |||
| -rw-r--r-- | extras/source/gallery/gallery_system/sg24.thm | bin | 1236 -> 1236 bytes | |||
| -rw-r--r-- | extras/source/palettes/standard.soc | 1 |
4 files changed, 1 insertions, 0 deletions
diff --git a/extras/source/gallery/gallery_system/sg24.sdg b/extras/source/gallery/gallery_system/sg24.sdg Binary files differindex 019c5801..7441d764 100644 --- a/extras/source/gallery/gallery_system/sg24.sdg +++ b/extras/source/gallery/gallery_system/sg24.sdg diff --git a/extras/source/gallery/gallery_system/sg24.sdv b/extras/source/gallery/gallery_system/sg24.sdv Binary files differindex adbf1a39..2e780644 100644 --- a/extras/source/gallery/gallery_system/sg24.sdv +++ b/extras/source/gallery/gallery_system/sg24.sdv diff --git a/extras/source/gallery/gallery_system/sg24.thm b/extras/source/gallery/gallery_system/sg24.thm Binary files differindex e44262ab..b821a9de 100644 --- a/extras/source/gallery/gallery_system/sg24.thm +++ b/extras/source/gallery/gallery_system/sg24.thm diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc index 1bab7f6e..0370e7af 100644 --- a/extras/source/palettes/standard.soc +++ b/extras/source/palettes/standard.soc @@ -48,6 +48,7 @@ <draw:color draw:name="Blue 6" draw:color="#0099ff"/> <draw:color draw:name="Blue 7" draw:color="#00b8ff"/> <draw:color draw:name="Blue 8" draw:color="#99ccff"/> + <draw:color draw:name="Blue 9" draw:color="#CFE7E5"/> <draw:color draw:name="Turquoise 1" draw:color="#00dcff"/> <draw:color draw:name="Turquoise 2" draw:color="#00cccc"/> <draw:color draw:name="Turquoise 3" draw:color="#23b8dc"/> |