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 /extras/source/gallery | |
parent | extras needs xsltproc for multilanguage build (diff) | |
parent | gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test,... (diff) | |
download | core-34a046f346d564aacb43f08a6b49e4703990315c.tar.gz core-34a046f346d564aacb43f08a6b49e4703990315c.zip |
Merge commit 'ooo/DEV300_m101' into integration/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
Diffstat (limited to 'extras/source/gallery')
-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 |
3 files changed, 0 insertions, 0 deletions
diff --git a/extras/source/gallery/gallery_system/sg24.sdg b/extras/source/gallery/gallery_system/sg24.sdg Binary files differindex 019c5801180c..7441d764cb37 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 adbf1a399f3f..2e780644618c 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 e44262abc470..b821a9de8bb2 100644 --- a/extras/source/gallery/gallery_system/sg24.thm +++ b/extras/source/gallery/gallery_system/sg24.thm |