diff -r d6c9d1ca2da4 -r 745d38097b7f Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Sep 29 15:08:57 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sun Sep 29 15:23:19 2013 +0200
@@ -48,8 +48,6 @@
def __enableOkButton(self):
"""
Private method used to enable/disable the OK-button.
-
- @param text ignored
"""
self.okButton.setDisabled(
self.tag1Combo.currentText() != "" or \
@@ -64,12 +62,16 @@
def on_tag1Combo_editTextChanged(self, text):
"""
Private slot to handle the tag1Combo editTextChanged signal.
+
+ @param text text of the combo (string)
"""
self.__enableOkButton()
def on_tag2Combo_editTextChanged(self, text):
"""
Private slot to handle the tag2Combo editTextChanged signal.
+
+ @param text text of the combo (string)
"""
self.__enableOkButton()
