Merge latest changes. 5_0_x

Sat, 18 Sep 2010 18:54:10 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 18 Sep 2010 18:54:10 +0200
branch
5_0_x
changeset 632
9754de0f663a
parent 631
9ca86837a591 (diff)
parent 621
777ea169520e (current diff)
child 636
dfdce6274606

Merge latest changes.

--- a/eric5-webbrowser.py	Thu Sep 16 08:57:24 2010 +0200
+++ b/eric5-webbrowser.py	Sat Sep 18 18:54:10 2010 +0200
@@ -30,6 +30,7 @@
     sys.path.insert(2, os.path.join(os.path.dirname(__file__), "ThirdParty", "Pygments"))
 
 from Utilities import Startup
+import Utilities
 
 def createMainWidget(argv):
     """

eric ide

mercurial