Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2018-03-19 16:34:40 +0000
committerOlivier Constant2018-03-19 16:34:40 +0000
commit6dee4c55614fe1ccde5447ce7a0ed7cb9600e53f (patch)
tree133ddfacf6106d61d35d636fd083822ee883d88d /releng
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 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/category.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.update/category.xml b/releng/org.eclipse.emf.diffmerge.update/category.xml
index ef9d8a45..e6d41d64 100644
--- a/releng/org.eclipse.emf.diffmerge.update/category.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -3,7 +3,7 @@
<feature url="features/org.eclipse.emf.diffmerge.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.9.1.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.9.0.qualifier">
@@ -12,7 +12,7 @@
<feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.9.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.9.1.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>

Back to the top