Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-05-28 13:10:47 +0000
committerOlivier Constant2018-05-28 13:10:47 +0000
commite96829af3676848719d1ff32a781a03c2cb6968e (patch)
treec4763bf6cbe8c5e4a8749d9ec00d41b2e267f1c9 /features/org.eclipse.emf.diffmerge.egit.feature
parent4b12a2aef25cd9f8b0129725420449b6319c879e (diff)
downloadorg.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.gz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.tar.xz
org.eclipse.emf.diffmerge.core-e96829af3676848719d1ff32a781a03c2cb6968e.zip
[releng] Update of contribution/notice files and copyright notices
Change-Id: I8fce49cd0fbe1bd2a201e7413cf74beb4cf5ca30 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features/org.eclipse.emf.diffmerge.egit.feature')
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.properties4
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml14
3 files changed, 17 insertions, 3 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/build.properties b/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
index e6f773a4..ec000cb3 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S. and others.
+# Copyright (c) 2016-2018 Thales Global Services S.A.S. and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties b/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties
index 3a23ced9..d8ff89cc 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2016-2017 Thales Global Services S.A.S.
+# Copyright (c) 2016-2018 Thales Global Services S.A.S.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -9,7 +9,7 @@ featureName = EMF Diff/Merge EGit Integration Feature (Incubation)
providerName = Eclipse Modeling Project
description = An integration of EMF Diff/Merge with EGit.
copyright=\
-Copyright (c) 2016-2017 Thales Global Services S.A.S.\n\
+Copyright (c) 2016-2018 Thales Global Services S.A.S.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Public License v1.0\n\
which accompanies this distribution, and is available at\n\
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index f0232afe..8ddedeb9 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <copyright>
+
+ Copyright (c) 2016-2018 Thales Global Services S.A.S.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+
+ Contributors:
+ Thales Global Services S.A.S - initial API and implementation
+
+ </copyright>
+-->
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"

Back to the top