summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/gui/mainwindow.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-02-07 16:10:27 -0300
committerTomás Touceda <chiiph@leap.se>2014-02-07 16:10:27 -0300
commit706a3cfe7806baed2d382acf8eb7358ef399b924 (patch)
tree0eaa6c93be91f7d4f7f335977e2ad187450ccdec /src/leap/bitmask/gui/mainwindow.py
parentc75a61d6eb5ab42744adcd1ee83dd1f95317ff09 (diff)
parent61420592e80d5446f8a5fba317316beeaff287e2 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/cosmetic-fixes' into develop
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
-rw-r--r--src/leap/bitmask/gui/mainwindow.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index db24a1c8..c078e3f4 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -20,8 +20,9 @@ Main window for Bitmask.
import logging
from threading import Condition
-from PySide import QtCore, QtGui
from datetime import datetime
+
+from PySide import QtCore, QtGui
from twisted.internet import threads
from zope.proxy import ProxyBase, setProxiedObject