diff options
| author | Eike Stepper | 2013-05-14 09:33:56 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-05-14 09:33:56 +0000 |
| commit | 4682da6dfcaa7314bcf37d0cbb1e58fa5b49ebd8 (patch) | |
| tree | b207930b3bf7ae76456d4431cda2758f3c3763bf /plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html | |
| parent | 92fb4fae15c51fc8f0c5c3013dd27633b3f62053 (diff) | |
| download | cdo-4682da6dfcaa7314bcf37d0cbb1e58fa5b49ebd8.tar.gz cdo-4682da6dfcaa7314bcf37d0cbb1e58fa5b49ebd8.tar.xz cdo-4682da6dfcaa7314bcf37d0cbb1e58fa5b49ebd8.zip | |
Update javadocs
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html index 93adb302e8..da483612e8 100644 --- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html +++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html @@ -296,7 +296,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.htm <TD><CODE><B>CDOMergingConflictResolver.</B><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html#getMerger()">getMerger</A></B>()</CODE> <BR> - <B>Deprecated.</B> </TD> + </TD> </TR> </TABLE> @@ -310,7 +310,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.htm <TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/spi/cdo/CDOMergingConflictResolver.html#CDOMergingConflictResolver(org.eclipse.emf.cdo.transaction.CDOMerger)">CDOMergingConflictResolver</A></B>(<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A> merger)</CODE> <BR> - <B>Deprecated.</B> </TD> + </TD> </TR> </TABLE> |