Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-03-19 16:34:40 +0000
committerOlivier Constant2018-03-19 16:34:40 +0000
commit6dee4c55614fe1ccde5447ce7a0ed7cb9600e53f (patch)
tree133ddfacf6106d61d35d636fd083822ee883d88d /features
parenta3f4f0d0d34d5f0b1ceb36155d6500284abab15f (diff)
downloadorg.eclipse.emf.diffmerge.core-6dee4c55614fe1ccde5447ce7a0ed7cb9600e53f.tar.gz
org.eclipse.emf.diffmerge.core-6dee4c55614fe1ccde5447ce7a0ed7cb9600e53f.tar.xz
org.eclipse.emf.diffmerge.core-6dee4c55614fe1ccde5447ce7a0ed7cb9600e53f.zip
Bug 532614 - Rebase conflicts lead to an NPE
Change-Id: Ib18ee639207f5970d12f4a85f93b86d899b0fdc2 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index b2979cfc..0e2cb69d 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
- version="0.9.0.qualifier"
+ version="0.9.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 6c67e120..e4428f85 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
label="%featureName"
- version="0.9.0.qualifier"
+ version="0.9.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">

Back to the top