Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2014-04-24 10:20:25 +0000
committerOlivier Constant2014-04-24 10:20:25 +0000
commitcf90a409b6353b6516cbe1691671ec551a1619e9 (patch)
treea22441587ac7c2d816d41f4942b75a413926404a /plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
parent69c886b70f298f678949f3151781ee388229b19d (diff)
downloadorg.eclipse.emf.diffmerge.core-cf90a409b6353b6516cbe1691671ec551a1619e9.tar.gz
org.eclipse.emf.diffmerge.core-cf90a409b6353b6516cbe1691671ec551a1619e9.tar.xz
org.eclipse.emf.diffmerge.core-cf90a409b6353b6516cbe1691671ec551a1619e9.zip
Bug 433376 - Update the Software User Agreement
Diffstat (limited to 'plugins/org.eclipse.emf.diffmerge.ui/plugin.properties')
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/plugin.properties18
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
index 996cd1dc..9903eb2f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.diffmerge.ui/plugin.properties
@@ -1,9 +1,9 @@
-###############################################################################
-# Copyright (c) 2010-2012 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
-###############################################################################
-pluginName = EMF Diff/Merge Sample UI Plug-In (Incubation)
-providerName = Eclipse Modeling Project
+###############################################################################
+# Copyright (c) 2010-2014 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
+###############################################################################
+pluginName = EMF Diff/Merge Sample UI Plug-In (Incubation)
+providerName = Eclipse Modeling Project

Back to the top