Merge m-c to autoland
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 05 Oct 2016 20:51:22 -0700
changeset 316642 690b07d2bc701ea389d6aabfa8231e58778bb9a4
parent 316641 800c4a33c285930094b42787ba6ab02a757347e8 (current diff)
parent 316575 c7d62e6d052c5d2638b08d480a720254ea09ff2d (diff)
child 316643 2273369348da5bb61af45c743ebe0faff1321d3e
push id30778
push usercbook@mozilla.com
push dateThu, 06 Oct 2016 09:56:14 +0000
treeherdermozilla-central@cc3ee8d499c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to autoland
--- a/devtools/client/preferences/devtools.js
+++ b/devtools/client/preferences/devtools.js
@@ -310,21 +310,17 @@ pref("devtools.webconsole.persistlog", f
 // any timestamps.
 pref("devtools.webconsole.timestampMessages", false);
 
 // Web Console automatic multiline mode: |true| if you want incomplete statements
 // to automatically trigger multiline editing (equivalent to shift + enter).
 pref("devtools.webconsole.autoMultiline", true);
 
 // Enable the experimental webconsole frontend (work in progress)
-#if defined(NIGHTLY_BUILD)
-pref("devtools.webconsole.new-frontend-enabled", true);
-#else
 pref("devtools.webconsole.new-frontend-enabled", false);
-#endif
 
 // Enable the experimental support for source maps in console (work in progress)
 pref("devtools.sourcemap.locations.enabled", false);
 
 // The number of lines that are displayed in the web console.
 pref("devtools.hud.loglimit", 1000);
 
 // The number of lines that are displayed in the web console for the Net,