diff options
| author | Eike Stepper | 2015-09-11 04:43:35 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-09-11 04:43:35 +0000 |
| commit | 130a6994656afb0e0d954a42c50d9db063c755d0 (patch) | |
| tree | 36d08b44cd47b44a9c4e4716565eacbd5249c434 /plugins/org.eclipse.emf.cdo.tests/META-INF | |
| parent | f7c4495e58380b03f363d7620c00b5f9ebe8a3f2 (diff) | |
| download | cdo-130a6994656afb0e0d954a42c50d9db063c755d0.tar.gz cdo-130a6994656afb0e0d954a42c50d9db063c755d0.tar.xz cdo-130a6994656afb0e0d954a42c50d9db063c755d0.zip | |
[477128] Support interactive merging in CDOWorkspace.update()
https://bugs.eclipse.org/bugs/show_bug.cgi?id=477128
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/META-INF')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF index 3e0f2ff4cd..84ee8f906e 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF @@ -36,7 +36,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit org.eclipse.emf.cdo.server.admin;bundle-version="[4.1.0,5.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)";visibility:=reexport, org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)", - org.apache.log4j;bundle-version="[1.2.15,1.3.0)", + org.apache.log4j;bundle-version="[1.2.0,2.0.0)", com.google.guava;bundle-version="[10.0.0,20.0.0)" Export-Package: base;version="4.0.200", base.impl;version="4.0.200", |