Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

merge: use wildcard imports for QtCore and QtGui

Changeset c710f424a20b…

Parent 9cd29d482d10…

by Yuki KODAMA

Changes to one file · Browse files at c710f424a20b Showing diff from parent 9cd29d482d10 Diff from another changeset...

Change 1 of 1 Show Entire File tortoisehg/​hgqt/​merge.py Stacked
 
5
6
7
8
9
10
11
12
 
 
13
14
15
 
5
6
7
 
 
 
 
 
8
9
10
11
12
@@ -5,11 +5,8 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2, incorporated herein by reference.   -from PyQt4.QtCore import Qt, pyqtSignal, QThread -from PyQt4.QtGui import QWizard, QWizardPage, QVBoxLayout, QHBoxLayout, QLabel -from PyQt4.QtGui import QCheckBox, QTextEdit, QTextCursor, QLineEdit, QWidget -from PyQt4.QtGui import QComboBox, QStackedLayout, QPushButton, QProgressBar -from PyQt4.QtGui import QMessageBox, QInputDialog +from PyQt4.QtCore import * +from PyQt4.QtGui import *    from mercurial import hg, ui