From c4d3ed8b70f2118652389b604a48c8846866f0ee Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 7 Jul 2010 16:55:10 +0000
Subject: [319090] Provide a CDOConflictResolver that uses a CDOMerger
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=319090

---
 plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/org.gastro.rcp.table')

diff --git a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
index 342dc8eb1f..12c12cdcf1 100644
--- a/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.rcp.table/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDO Gastro Example RCP Table
 Bundle-SymbolicName: org.gastro.rcp.table; singleton:=true
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 4.0.0.qualifier
 Bundle-Activator: org.gastro.rcp.internal.table.Activator
-Require-Bundle: org.gastro.rcp;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Require-Bundle: org.gastro.rcp;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: Eclipse Modeling Project
-Export-Package: com.swtdesigner;version="3.0.0";x-internal:=true,
- org.gastro.rcp.internal.table;version="3.0.0";x-internal:=true
+Export-Package: com.swtdesigner;version="4.0.0";x-internal:=true,
+ org.gastro.rcp.internal.table;version="4.0.0";x-internal:=true
-- 
cgit v1.2.3