diff -r c5db073a124f -r 7afaf2fca55b Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html --- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Sat Aug 20 16:28:25 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html Sat Aug 20 16:30:49 2011 +0200 @@ -51,12 +51,13 @@ <table> <tr><td>None</td></tr> </table> +<h3>Class Methods</h3> +<table> +<tr><td>None</td></tr> +</table> <h3>Methods</h3> <table> <tr> -<td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> -<td>Constructor</td> -</tr><tr> <td><a href="#SvnMergeDialog.__enableOkButton">__enableOkButton</a></td> <td>Private method used to enable/disable the OK-button.</td> </tr><tr> @@ -70,6 +71,10 @@ <td>Private slot to handle the tag2Combo editTextChanged signal.</td> </tr> </table> +<h3>Static Methods</h3> +<table> +<tr><td>None</td></tr> +</table> <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> <h4>SvnMergeDialog (Constructor)</h4> <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>)