You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/03/16 14:34:52 UTC
svn commit: r1855652 - in /openoffice/branches/AOO42X: ./
main/default_images/introabout/dev/ main/desktop/zipintro/makefile.mk
main/ooo_custom_images/dev/
Author: mseidel
Date: Sat Mar 16 14:34:52 2019
New Revision: 1855652
URL: http://svn.apache.org/viewvc?rev=1855652&view=rev
Log:
Merged r1855649 from trunk
Relocate intro/about graphics for Developer Build from /ooo_custom_images to /default_images
Added:
openoffice/branches/AOO42X/main/default_images/introabout/dev/
- copied from r1855649, openoffice/trunk/main/default_images/introabout/dev/
Removed:
openoffice/branches/AOO42X/main/ooo_custom_images/dev/
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 16 14:34:52 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649
Modified: openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk?rev=1855652&r1=1855651&r2=1855652&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk Sat Mar 16 14:34:52 2019
@@ -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)) \