diff options
author | Eike Stepper | 2011-04-13 13:49:46 +0000 |
---|---|---|
committer | Eike Stepper | 2011-04-13 13:49:46 +0000 |
commit | a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee (patch) | |
tree | d62cf30cbd2b94f4fc1637a47c804f32529465d6 /plugins/org.eclipse.emf.cdo.tests/META-INF | |
parent | aafe6ac6268b02028dfd9e9ab987a79b8f38bd82 (diff) | |
download | cdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.tar.gz cdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.tar.xz cdo-a56c7d7dbb56ec9a48becf0851c1698cb78ce5ee.zip |
[341469] Make CDOMergingConflictResolver stable
https://bugs.eclipse.org/bugs/show_bug.cgi?id=341469
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/META-INF')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF | 1 |
1 files changed, 1 insertions, 0 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 e1750ad155..cc0e3ca91c 100644 --- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF @@ -29,6 +29,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit org.eclipse.emf.cdo.tests.model4;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model4interfaces;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.cdo.tests.model5;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.cdo.tests.model6;bundle-version="[4.0.0,5.0.0)", org.eclipse.emf.cdo.defs;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.server.ocl;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.workspace;bundle-version="[4.0.0,5.0.0)" |