Mercurial Repositories > eric / changeset
changeset
Merged remote changes.
Sat, 20 Oct 2012 17:28:38 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 20 Oct 2012 17:28:38 +0200
- changeset 2155
- b2aba7aeab3a
- parent 2154
- e70eb95d57e5 (diff)
- parent 2153
- 69569d2a556d (current diff)
- child 2158
- 31a20aed2406
Merged remote changes.
| UI/UserInterface.py | file | annotate | diff | comparison | revisions |
--- a/UI/UserInterface.py Tue Oct 16 19:47:32 2012 +0200 +++ b/UI/UserInterface.py Sat Oct 20 17:28:38 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://"):
