Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Sat, 13 Jun 2015 19:28:13 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 13 Jun 2015 19:28:13 +0200
- changeset 4279
- 66b5f61b962d
- parent 4278
- ccd1e13cb9bd (current diff)
- parent 4277
- b4b10e89e247 (diff)
- child 4282
- c72c9b51ae73
Merged remote changes.
--- a/eric6.py Sat Jun 13 19:27:40 2015 +0200 +++ b/eric6.py Sat Jun 13 19:28:13 2015 +0200 @@ -20,7 +20,7 @@ restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList] -import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ +import Toolbox.PyQt4ImportHook # __IGNORE_WARNING__ try: # Only for Py2 import StringIO as io # __IGNORE_EXCEPTION__
