You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2017/10/07 19:38:17 UTC

incubator-netbeans git commit: [NETBEANS-54] Module Review apisupport.harness

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 0ed2eb83b -> cd0beb4f6


[NETBEANS-54] Module Review apisupport.harness



Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/cd0beb4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/cd0beb4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/cd0beb4f

Branch: refs/heads/master
Commit: cd0beb4f6c4c89f8de214fae56c5ecc44d01580d
Parents: 0ed2eb8
Author: Bastien Jansen <ba...@gmx.com>
Authored: Sat Oct 7 21:37:45 2017 +0200
Committer: Emilian Bold <em...@gmail.com>
Committed: Sat Oct 7 22:37:45 2017 +0300

----------------------------------------------------------------------
 apisupport.harness/windows-launcher-src/app.rc | 47 ++++++---------------
 1 file changed, 14 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/cd0beb4f/apisupport.harness/windows-launcher-src/app.rc
----------------------------------------------------------------------
diff --git a/apisupport.harness/windows-launcher-src/app.rc b/apisupport.harness/windows-launcher-src/app.rc
index bddb177..345b1a5 100644
--- a/apisupport.harness/windows-launcher-src/app.rc
+++ b/apisupport.harness/windows-launcher-src/app.rc
@@ -1,38 +1,19 @@
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+// 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
+// regarding copyright ownership.  The ASF licenses this file
+// 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
 //
-// Copyright 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+//   http://www.apache.org/licenses/LICENSE-2.0
 //
-// Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-// Other names may be trademarks of their respective owners.
-//
-// The contents of this file are subject to the terms of either the GNU
-// General Public License Version 2 only ("GPL") or the Common
-// Development and Distribution License("CDDL") (collectively, the
-// "License"). You may not use this file except in compliance with the
-// License. You can obtain a copy of the License at
-// http://www.netbeans.org/cddl-gplv2.html
-// or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-// specific language governing permissions and limitations under the
-// License.  When distributing the software, include this License Header
-// Notice in each file and include the License file at
-// nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-// particular file as subject to the "Classpath" exception as provided
-// by Oracle in the GPL Version 2 section of the License file that
-// accompanied this code. If applicable, add the following below the
-// License Header, with the fields enclosed by brackets [] replaced by
-// your own identifying information:
-// "Portions Copyrighted [year] [name of copyright owner]"
-//
-// If you wish your version of this file to be governed by only the CDDL
-// or only the GPL Version 2, indicate your decision by adding
-// "[Contributor] elects to include this software in this distribution
-// under the [CDDL or GPL Version 2] license." If you do not indicate a
-// single choice of license, a recipient has the option to distribute
-// your version of this file under either the CDDL, the GPL Version 2 or
-// to extend the choice of license to its licensees as provided above.
-// However, if you add GPL Version 2 code and therefore, elected the GPL
-// Version 2 license, then the option applies only if the new code is
-// made subject to such option by the copyright holder.
+// 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.
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.