Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2014-09-02 09:45:33 +0000
committerOlivier Constant2014-09-02 09:45:33 +0000
commit7778b8da51a2d25b7c8c0ab14148a17c5d2c9fdb (patch)
tree52d30a3941978a6644e28959ee499a75f80b82f2 /features
parent8ed644b6f3daccdb01b0e7421042254cc633bcee (diff)
downloadorg.eclipse.emf.diffmerge.core-7778b8da51a2d25b7c8c0ab14148a17c5d2c9fdb.tar.gz
org.eclipse.emf.diffmerge.core-7778b8da51a2d25b7c8c0ab14148a17c5d2c9fdb.tar.xz
org.eclipse.emf.diffmerge.core-7778b8da51a2d25b7c8c0ab14148a17c5d2c9fdb.zip
Increased version number, updated copyrights, updated .gitignore
Change-Id: Ia9bd69484ba5983040389893e5debb14cf3b77c6 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/build.properties2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml104
2 files changed, 53 insertions, 53 deletions
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties b/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
index 0103b19a..ad87127c 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2010-2012 Thales Global Services S.A.S.
+# 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
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index a11a35f3..5eec9d41 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.diffmerge.sdk.feature"
- label="EMF Diff/Merge SDK Feature (Incubation)"
- version="0.3.0.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <description>
- A diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.diffmerge.sdk.feature"
+ label="EMF Diff/Merge SDK Feature (Incubation)"
+ version="0.4.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <description>
+ A diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
+ </description>
+
+ <copyright>
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
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.diffmerge.sdk.source.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.gmf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.ui.gmf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.sdk.source.feature"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.gmf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.ui.gmf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>

Back to the top