Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py

changeset 1112
8a7d1b9d18db
parent 945
8cd4d08fa9f6
child 1131
7781e396c903
diff -r 9552b5e16a07 -r 8a7d1b9d18db Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sat Jun 04 11:53:15 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py	Sun Jun 05 18:25:36 2011 +0200
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the data for a merge operation.
 """
 
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from PyQt4.QtCore import QRegExp
+from PyQt4.QtGui import QDialog, QDialogButtonBox
 
 from .Ui_SvnMergeDialog import Ui_SvnMergeDialog
 

eric ide

mercurial