Author: mseidel
Date: Sun Mar 10 09:04:46 2019
New Revision: 1855141
URL: http://svn.apache.org/viewvc?rev=1855141&view=rev
Log:
Merged r1855140 from trunk
Added graphic for Developer build
Added:
openoffice/branches/AOO42X/main/ooo_custom_images/dev/introabout/about.png
- copied unchanged from r1855140,
openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 10 09:04:46 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
+/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
Modified: openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk?rev=1855141&r1=1855140&r2=1855141&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk (original)
+++ openoffice/branches/AOO42X/main/desktop/zipintro/makefile.mk Sun Mar 10
09:04:46 2019
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -27,13 +27,13 @@ PRJNAME=desktop
TARGET=zipintro
# --- Settings -----------------------------------------------------------
-.INCLUDE : settings.mk
+.INCLUDE : settings.mk
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)$/$(RSCDEFIMG)$/introabout$/about.png
$(ABOUT_BITMAPS)) \
+ $(null,$(ABOUT_BITMAPS)
$(MISC)$/ooo_custom_images$/dev$/introabout$/about.png $(ABOUT_BITMAPS)) \
$(MISC)$/$(RSCDEFIMG)$/introabout$/logo.png
ZIP2LIST= \
$(null,$(INTRO_BITMAPS)
$(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS))
\
@@ -67,7 +67,7 @@ ZIP4DEPS=$(ZIP4LIST)
ZIP5TARGET=beta_intro
ZIP5DEPS=$(ZIP5LIST)
-.INCLUDE : target.mk
+.INCLUDE : target.mk
ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip)
@@ -103,3 +103,5 @@ $(MISC)$/%.bmp : $(SOLARSRC)$/%.bmp
$(MISC)$/%.png : $(SOLARSRC)$/%.png
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
+
+# vim: set noet ts=4 sw=4:
