Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Tue, 23 Oct 2012 20:06:53 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 23 Oct 2012 20:06:53 +0200
- changeset 2158
- 31a20aed2406
- parent 2157
- aa3bdc7cb686 (current diff)
- parent 2155
- b2aba7aeab3a (diff)
- child 2160
- 1874d4410904
Merged remote changes.
--- a/UI/UserInterface.py Tue Oct 23 20:06:07 2012 +0200 +++ b/UI/UserInterface.py Tue Oct 23 20:06:53 2012 +0200 @@ -4387,7 +4387,7 @@ default = "" pythonDocDir = Utilities.getEnvironmentEntry("PYTHON2DOCDIR", default) else: - pythonDocDir = Utilities.getEnvironmentEntry("PYTHON3DOCDIR", + pythonDocDir = Utilities.getEnvironmentEntry("PYTHON2DOCDIR", '/usr/share/doc/packages/python/html/python-docs-html') if not pythonDocDir.startswith("http://") and \ not pythonDocDir.startswith("https://"):
