Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-02 05:52:59 -0400
committerEike Stepper2012-10-02 05:52:59 -0400
commit784c02509d20fba8773aa93c05b152736b475e94 (patch)
tree2df281448a23fe7c5628d970e3c6a619ca822f36 /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
parentb4ca9cb665d6254836021a5998d426b9292a7d90 (diff)
downloadcdo-784c02509d20fba8773aa93c05b152736b475e94.tar.gz
cdo-784c02509d20fba8773aa93c05b152736b475e94.tar.xz
cdo-784c02509d20fba8773aa93c05b152736b475e94.zip
Update Javadocs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
index c8691d53ee..e430aa2a7c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
@@ -288,6 +288,10 @@ Client service provider interfaces and useful base implementations.
<TD>If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.MergeData.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOSession.MergeData</A></B></TD>
+<TD>A data structure that holds all input and output values of <A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOSession.html#getMergeData(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.common.branch.CDOBranchPoint, boolean)"><CODE>InternalCDOSession.getMergeData()</CODE></A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOTransaction.ApplyChangeSetResult.html" title="class in org.eclipse.emf.spi.cdo">InternalCDOTransaction.ApplyChangeSetResult</A></B></TD>
<TD>If the meaning of this type isn't clear, there really should be more of a description here...</TD>
</TR>

Back to the top