diff options
| author | Armin Le Grand <alg@apache.org> | 2012-12-05 16:17:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 17:04:28 +0100 |
| commit | fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f (patch) | |
| tree | 9b099e9edca5ee8993a86cf5989b34c46d76e7cd /extras/Package_gallsystem.mk | |
| parent | [coretext] Fix drawing fallback fonts (diff) | |
| download | core-fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f.tar.gz core-fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f.zip | |
Resolves: #i121407# Gallery reorganizations...
and additions of new themes
(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)
Conflicts:
extras/prj/build.lst
extras/source/gallery/bullets/makefile.mk
extras/source/gallery/gallery_system/sg2.sdg
extras/source/gallery/gallery_system/sg2.sdv
extras/source/gallery/gallery_system/sg2.thm
extras/util/target.pmk
scp2/source/ooo/directory_ooo.scp
scp2/source/ooo/file_extra_ooo.scp
svx/inc/galtheme.hrc
svx/source/gallery2/gallery1.cxx
svx/source/gallery2/galobj.cxx
svx/source/gallery2/galtheme.src
vcl/inc/vcl/alpha.hxx
vcl/inc/vcl/bitmap.hxx
vcl/inc/vcl/bitmapex.hxx
vcl/source/gdi/alpha.cxx
vcl/source/gdi/bitmap.cxx
vcl/source/gdi/bitmap3.cxx
vcl/source/gdi/bitmapex.cxx
(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)
Conflicts:
vcl/source/gdi/bitmap3.cxx
Change-Id: If4b2397b889f914487f2135679250c175181e1df
Diffstat (limited to 'extras/Package_gallsystem.mk')
| -rw-r--r-- | extras/Package_gallsystem.mk | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk index 85718e7d8bc3..a51aaba61592 100644 --- a/extras/Package_gallsystem.mk +++ b/extras/Package_gallsystem.mk @@ -15,12 +15,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ sg1.sdg \ sg1.sdv \ sg1.thm \ - sg24.sdg \ - sg24.sdv \ - sg24.thm \ - sg36.sdg \ - sg36.sdv \ - sg36.thm \ sg3.sdg \ sg3.sdv \ sg3.thm \ @@ -30,6 +24,42 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\ sg9.sdg \ sg9.sdv \ sg9.thm \ + sg10.sdg \ + sg10.sdv \ + sg10.thm \ + sg11.sdg \ + sg11.sdv \ + sg11.thm \ + sg12.sdg \ + sg12.sdv \ + sg12.thm \ + sg13.sdg \ + sg13.sdv \ + sg13.thm \ + sg14.sdg \ + sg14.sdv \ + sg14.thm \ + sg15.sdg \ + sg15.sdv \ + sg15.thm \ + sg16.sdg \ + sg16.sdv \ + sg16.thm \ + sg17.sdg \ + sg17.sdv \ + sg17.thm \ + sg18.sdg \ + sg18.sdv \ + sg18.thm \ + sg19.sdg \ + sg19.sdv \ + sg19.thm \ + sg24.sdg \ + sg24.sdv \ + sg24.thm \ + sg36.sdg \ + sg36.sdv \ + sg36.thm \ )) # vim: set noet sw=4 ts=4: |