Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe DUL2020-10-12 11:26:22 +0000
committerPhilippe DUL2020-10-12 11:27:16 +0000
commit369bccf3f3456bd46ae0dcde682c3e0c79c25d45 (patch)
tree2d65eb5b3154a4d93ad168c0b3cf0727a98a9511 /plugins
parent6f2907f66eb9081d487175c25c4518259307f359 (diff)
parent209b47a92b6bdd49dbf752a77611b56abd038734 (diff)
downloadorg.eclipse.emf.diffmerge.core-master.tar.gz
org.eclipse.emf.diffmerge.core-master.tar.xz
org.eclipse.emf.diffmerge.core-master.zip
Merge branch 'master' into genericHEADmastergeneric
Change-Id: I388e9d4edc0551e37f90650d32ee95c5263c065b Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
index 572a0d65..5ab86e86 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
@@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.diffmerge.ui,
org.eclipse.emf.diffmerge.connector.core,
org.eclipse.jgit,
- org.eclipse.egit.core;bundle-version="3.6.0",
- org.eclipse.egit.ui;bundle-version="3.6.0"
+ org.eclipse.egit.core,
+ org.eclipse.egit.ui
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.diffmerge.connector.git.EMFDiffMergeGitConnectorPlugin

Back to the top