Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
index d9ec78fc00..f646e89a49 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
@@ -470,13 +470,13 @@
</td>
</tr>
<tr class="altColor">
-<td class="colOne"><a href="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.PerSide.html#org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.PerSide</a>
+<td class="colOne"><a href="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html#org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide</a>
<div class="block">Holds data for the source and target sides.</div>
</td>
</tr>
<tr class="rowColor">
-<td class="colOne"><a href="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValued.Side.html#org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValued.Side</a>
-<div class="block">Enumerates the possible sides of a merge, i.e., <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html#SOURCE"><code>DefaultCDOMerger.PerFeature.ManyValued.Side.SOURCE</code></a> and <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValued.Side.html#TARGET"><code>DefaultCDOMerger.PerFeature.ManyValued.Side.TARGET</code></a>.</div>
+<td class="colOne"><a href="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#org.eclipse.emf.spi.cdo">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a>
+<div class="block">Enumerates the possible sides of a merge, i.e., <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#SOURCE"><code>DefaultCDOMerger.PerFeature.ManyValuedOld.Side.SOURCE</code></a> and <a href="../../../../../org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html#TARGET"><code>DefaultCDOMerger.PerFeature.ManyValuedOld.Side.TARGET</code></a>.</div>
</td>
</tr>
<tr class="altColor">

Back to the top