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-frame.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
index 26f61b7165..62b54e79c5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-frame.html
@@ -66,8 +66,9 @@
<li><a href="DefaultCDOMerger.Conflict.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.Conflict</a></li>
<li><a href="DefaultCDOMerger.PerFeature.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature</a></li>
<li><a href="DefaultCDOMerger.PerFeature.ManyValued.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued</a></li>
-<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Element.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.Element</a></li>
-<li><a href="DefaultCDOMerger.PerFeature.ManyValued.PerSide.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.PerSide</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValuedOld</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Element.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValuedOld.Element</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValuedOld.PerSide</a></li>
<li><a href="FSMUtil.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">FSMUtil</a></li>
<li><a href="InternalCDOSession.CommitToken.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOSession.CommitToken</a></li>
<li><a href="InternalCDOSession.InvalidationData.html" title="class in org.eclipse.emf.spi.cdo" target="classFrame">InternalCDOSession.InvalidationData</a></li>
@@ -79,7 +80,7 @@
</ul>
<h2 title="Enums">Enums</h2>
<ul title="Enums">
-<li><a href="DefaultCDOMerger.PerFeature.ManyValued.Side.html" title="enum in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValued.Side</a></li>
+<li><a href="DefaultCDOMerger.PerFeature.ManyValuedOld.Side.html" title="enum in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.PerFeature.ManyValuedOld.Side</a></li>
<li><a href="DefaultCDOMerger.ResolutionPreference.html" title="enum in org.eclipse.emf.spi.cdo" target="classFrame">DefaultCDOMerger.ResolutionPreference</a></li>
</ul>
<h2 title="Exceptions">Exceptions</h2>

Back to the top