From commits-return-53806-archive-asf-public=cust-asf.ponee.io@openoffice.apache.org Sun Mar 10 09:03:06 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id E3214180621 for ; Sun, 10 Mar 2019 10:03:05 +0100 (CET) Received: (qmail 32122 invoked by uid 500); 10 Mar 2019 09:03:05 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 32113 invoked by uid 99); 10 Mar 2019 09:03:05 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Mar 2019 09:03:05 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BC3E43A008F for ; Sun, 10 Mar 2019 09:03:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1855140 - in /openoffice/trunk/main: desktop/zipintro/makefile.mk ooo_custom_images/dev/introabout/about.png Date: Sun, 10 Mar 2019 09:03:03 -0000 To: commits@openoffice.apache.org From: mseidel@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20190310090303.BC3E43A008F@svn01-us-west.apache.org> Author: mseidel Date: Sun Mar 10 09:03:03 2019 New Revision: 1855140 URL: http://svn.apache.org/viewvc?rev=1855140&view=rev Log: Added graphic for Developer build Added: openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png (with props) Modified: openoffice/trunk/main/desktop/zipintro/makefile.mk Modified: openoffice/trunk/main/desktop/zipintro/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/zipintro/makefile.mk?rev=1855140&r1=1855139&r2=1855140&view=diff ============================================================================== --- openoffice/trunk/main/desktop/zipintro/makefile.mk (original) +++ openoffice/trunk/main/desktop/zipintro/makefile.mk Sun Mar 10 09:03:03 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: Added: openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png URL: http://svn.apache.org/viewvc/openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png?rev=1855140&view=auto ============================================================================== Binary file - no diff available. Propchange: openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png ------------------------------------------------------------------------------ svn:executable = * Propchange: openoffice/trunk/main/ooo_custom_images/dev/introabout/about.png ------------------------------------------------------------------------------ svn:mime-type = image/png