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 17:16:36 UTC
incubator-netbeans git commit: [NETBEANS-54] Module Review mylyn.util
Repository: incubator-netbeans
Updated Branches:
refs/heads/master d7a7719b0 -> f430c53b5
[NETBEANS-54] Module Review mylyn.util
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/f430c53b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/f430c53b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/f430c53b
Branch: refs/heads/master
Commit: f430c53b5a28ccc260f1706c08e339cf667382ca
Parents: d7a7719
Author: Mohammed Ammer <mo...@gmail.com>
Authored: Sat Oct 7 19:15:53 2017 +0200
Committer: Emilian Bold <em...@gmail.com>
Committed: Sat Oct 7 20:15:53 2017 +0300
----------------------------------------------------------------------
.../modules/mylyn/util/wiki/Bundle.properties | 55 ++++++--------------
1 file changed, 16 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/f430c53b/mylyn.util/src/org/netbeans/modules/mylyn/util/wiki/Bundle.properties
----------------------------------------------------------------------
diff --git a/mylyn.util/src/org/netbeans/modules/mylyn/util/wiki/Bundle.properties b/mylyn.util/src/org/netbeans/modules/mylyn/util/wiki/Bundle.properties
index 2ec1778..f38b6f5 100644
--- a/mylyn.util/src/org/netbeans/modules/mylyn/util/wiki/Bundle.properties
+++ b/mylyn.util/src/org/netbeans/modules/mylyn/util/wiki/Bundle.properties
@@ -1,42 +1,19 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-# Copyright 2012 Oracle and/or its affiliates. All rights reserved.
-
-# 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.
-
-# Contributor(s):
-
-# Portions Copyrighted 2012 Sun Microsystems, Inc.
+# 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
+#
+# 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.
TOOL_Preview=Show Preview
TOOL_Edit=Edit Source