Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-07-16 12:06:22 +0000
committerOlivier Constant2019-07-16 12:06:22 +0000
commitcd82bef6401c91860c48219f0a243599dc55887b (patch)
tree46d8efb118e10d81cf9490f1873210e074b49369 /features/org.eclipse.emf.diffmerge.egit.feature
parentcfd2e6802e77f1a2a6b1a66061e8a2994eaa7e71 (diff)
parent363ff1d41ca4bc3ae293209906135f55ab3ddb33 (diff)
downloadorg.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.gz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.xz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.zip
Merge branch '0.11.x'
Conflicts: releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I9711d30d104f3fb7e63e125e1a7400d6d0b4f246 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/.project34
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml2
2 files changed, 18 insertions, 18 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/.project b/features/org.eclipse.emf.diffmerge.egit.feature/.project
index cf319295..21243d64 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/.project
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.egit.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.egit.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index 87a97b7b..39ac2a2a 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">

Back to the top