OpenJDK / amber / amber
changeset 59850:d20418cfe16e
Merge
author | jwilhelm |
---|---|
date | Thu, 30 Jan 2020 05:05:04 +0100 |
parents | 91994dfee869 42a0eaefc1db |
children | 74ecb602ffb0 |
files | .hgtags |
diffstat | 2 files changed, 1 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 30 03:29:55 2020 +0100 +++ b/.hgtags Thu Jan 30 05:05:04 2020 +0100 @@ -614,4 +614,5 @@ ef7d53b4fccd4a0501b17d974e84f37aa99fa813 jdk-15+6 f728b6c7f4910d6bd6070cb4dde8393f4ba95113 jdk-14+33 e2bc57500c1b785837982f7ce8af6751387ed73b jdk-15+7 +a96bc204e3b31ddbf909b20088964112f052927e jdk-14+34 c7d4f2849dbfb755fc5860b362a4044ea0c9e082 jdk-15+8
--- a/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template Thu Jan 30 03:29:55 2020 +0100 +++ b/src/jdk.incubator.jpackage/windows/classes/jdk/incubator/jpackage/internal/resources/WinLauncher.template Thu Jan 30 05:05:04 2020 +0100 @@ -1,29 +1,3 @@ -# -# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# This code is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License version 2 only, as -# published by the Free Software Foundation. Oracle designates this -# particular file as subject to the "Classpath" exception as provided -# by Oracle in the LICENSE file that accompanied this code. -# -# This code is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# version 2 for more details (a copy is included in the LICENSE file that -# accompanied this code). -# -# You should have received a copy of the GNU General Public License version -# 2 along with this work; if not, write to the Free Software Foundation, -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -# or visit www.oracle.com if you need additional information or have any -# questions. -# -# - CompanyName=COMPANY_NAME FileDescription=FILE_DESCRIPTION FileVersion=FILE_VERSION