Mercurial Repositories > eric / changeset
changeset
Merged with remote changes.
Sun, 18 Oct 2015 17:41:17 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 18 Oct 2015 17:41:17 +0200
- changeset 4499
- 40b40003a44f
- parent 4498
- 1eeb430df3a2 (current diff)
- parent 4496
- 4857c41eafd6 (diff)
- child 4500
- 884269e383f7
Merged with remote changes.
--- a/Debugger/DebugServer.py Sun Oct 11 12:09:50 2015 +0200 +++ b/Debugger/DebugServer.py Sun Oct 18 17:41:17 2015 +0200 @@ -33,7 +33,7 @@ DebuggerInterfaces = [ "DebuggerInterfacePython", "DebuggerInterfacePython3", -## "DebuggerInterfaceRuby", + ## "DebuggerInterfaceRuby", "DebuggerInterfaceNone", ]
--- a/Preferences/__init__.py Sun Oct 11 12:09:50 2015 +0200 +++ b/Preferences/__init__.py Sun Oct 18 17:41:17 2015 +0200 @@ -2408,7 +2408,8 @@ "DiskCacheEnabled", "FilterTrackingCookies", "PrintBackgrounds", "AdBlockEnabled", "AutoLoadImages", "JavaEnabled", "JavaScriptEnabled", - "JavaScriptCanOpenWindows", "JavaScriptCanAccessClipboard", + "JavaScriptCanOpenWindows", "JavaScriptCanCloseWindows", + "JavaScriptCanAccessClipboard", "PluginsEnabled", "DnsPrefetchEnabled", "OfflineStorageDatabaseEnabled", "OfflineWebApplicationCacheEnabled", "LocalStorageEnabled",
