Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-07-07 16:55:10 +0000
committerEike Stepper2010-07-07 16:55:10 +0000
commitc4d3ed8b70f2118652389b604a48c8846866f0ee (patch)
tree371a60f9a72c160a7e8ee7868ab2ab6b02a60c21 /plugins/org.gastro.testclient
parente226589b37d964e9d58de60b4ecdc8a66f52a96f (diff)
downloadcdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.gz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.tar.xz
cdo-c4d3ed8b70f2118652389b604a48c8846866f0ee.zip
[319090] Provide a CDOConflictResolver that uses a CDOMerger
https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090
Diffstat (limited to 'plugins/org.gastro.testclient')
-rw-r--r--plugins/org.gastro.testclient/META-INF/MANIFEST.MF6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
index 66a7a7f4fe..bdeabdee49 100644
--- a/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.testclient/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: CDO Gastro Example Test Client
Bundle-SymbolicName: org.gastro.testclient
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.100.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.net4j.tcp;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.emf.cdo.net4j;bundle-version="[2.0.0,4.0.0)";resolution:=optional,
- org.eclipse.emf.cdo.ui;bundle-version="[2.0.0,4.0.0)",
+ org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
+ org.eclipse.emf.cdo.ui;bundle-version="[4.0.0,5.0.0)",
org.gastro.business;bundle-version="1.0.0",
org.gastro.business.edit;bundle-version="1.0.0",
org.gastro.inventory;bundle-version="1.0.0",

Back to the top