[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - default_images/framework default_images/introabout desktop/zipintro ooo_custom_images/dev

[Libreoffice Gerrit user]

 default_images/framework/res/dev/backing.png             |binary
 default_images/framework/res/dev/backing_hc.png          |binary
 default_images/framework/res/dev/backing_rtl_left.png    |binary
 default_images/framework/res/dev/backing_rtl_left_hc.png |binary
 default_images/introabout/dev/intro.png                  |binary
 desktop/zipintro/makefile.mk                             |    4 ++--
 dev/null                                                 |binary
 7 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fc47e30b340396afbba925c66f071d436be793ea
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Mar 16 14:23:47 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Mar 16 14:23:47 2019 +0000

    Relocate intro/about graphics for Developer Build from /ooo_custom_images to /default_images

diff --git a/ooo_custom_images/dev/introabout/about.png b/default_images/introabout/dev/about.png
similarity index 100%
rename from ooo_custom_images/dev/introabout/about.png
rename to default_images/introabout/dev/about.png
diff --git a/ooo_custom_images/dev/introabout/intro.png b/default_images/introabout/dev/intro.png
old mode 100755
new mode 100644
similarity index 100%
rename from ooo_custom_images/dev/introabout/intro.png
rename to default_images/introabout/dev/intro.png
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 3a82e7725781..3e65dfcf7f93 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -32,8 +32,8 @@ TARGET=zipintro
 DEFAULT_FLAVOURS=dev dev_nologo nologo intro beta
 
 ZIP1LIST= \
-    $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/about.png $(ABOUT_BITMAPS)) \
+    $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/intro.png $(INTRO_BITMAPS)) \
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/dev$/about.png $(ABOUT_BITMAPS)) \
     $(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
 ZIP2LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \
commit 372b3d210849aa125794ec044efa20763b5332d1
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Sat Mar 16 13:45:27 2019 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Sat Mar 16 13:45:27 2019 +0000

    Updated graphics for Developer build.

diff --git a/default_images/framework/res/dev/backing.png b/default_images/framework/res/dev/backing.png
index 1de76d4114c1..03ea6fa27eb8 100644
Binary files a/default_images/framework/res/dev/backing.png and b/default_images/framework/res/dev/backing.png differ
diff --git a/default_images/framework/res/dev/backing_hc.png b/default_images/framework/res/dev/backing_hc.png
index 7c16a2e9b91b..50d42b4d35f8 100755
Binary files a/default_images/framework/res/dev/backing_hc.png and b/default_images/framework/res/dev/backing_hc.png differ
diff --git a/default_images/framework/res/dev/backing_rtl_left.png b/default_images/framework/res/dev/backing_rtl_left.png
index e4239921a77b..7655b6be2b23 100755
Binary files a/default_images/framework/res/dev/backing_rtl_left.png and b/default_images/framework/res/dev/backing_rtl_left.png differ
diff --git a/default_images/framework/res/dev/backing_rtl_left_hc.png b/default_images/framework/res/dev/backing_rtl_left_hc.png
index 0478a7335436..a22ba7803e93 100755
Binary files a/default_images/framework/res/dev/backing_rtl_left_hc.png and b/default_images/framework/res/dev/backing_rtl_left_hc.png differ
diff --git a/ooo_custom_images/dev/introabout/intro.png b/ooo_custom_images/dev/introabout/intro.png
index 7c60f941e9ab..be3933722b2e 100755
Binary files a/ooo_custom_images/dev/introabout/intro.png and b/ooo_custom_images/dev/introabout/intro.png differ