Merge.
authorJan de Mooij <jdemooij@mozilla.com>
Wed, 03 Apr 2013 17:38:16 +0200
changeset 138408 b5cb88ccd907aaa3bf5efd192bd14f1f43b5b058
parent 138407 79542849f3f33ea9b7b27c046c9017db7946626b (current diff)
parent 137988 b31bfbb2bdc4d0082211dda3095456f22fec01c6 (diff)
child 138409 f20b0ce9e5280e9add20742262aa90440404f9cc
child 138435 c054eef6ba7750ad38f160a2be2590ef45fb2d5e
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone23.0a1
first release with
nightly linux32
b5cb88ccd907 / 23.0a1 / 20130403090950 / files
nightly linux64
b5cb88ccd907 / 23.0a1 / 20130403090950 / files
nightly mac
b5cb88ccd907 / 23.0a1 / 20130403090950 / files
nightly win32
b5cb88ccd907 / 23.0a1 / 20130403090950 / files
nightly win64
b5cb88ccd907 / 23.0a1 / 20130403090950 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge.
--- a/toolkit/components/console/content/console.xul
+++ b/toolkit/components/console/content/console.xul
@@ -88,13 +88,14 @@
   </toolbox>
 
   <vbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext" persist="sortOrder"/>
 
   <iframe name="Evaluator" id="Evaluator" collapsed="true"/>
 
   <statusbar>
     <statusbarpanel flex="1" pack="start">
-      <label value="&filter2.label;" accesskey="&filter2.accesskey;" control="Filter"/>
-      <textbox type="search" id="Filter" oncommand="changeFilter();"/>
+      <label value="&filter2.label;" control="Filter"/>
+      <textbox accesskey="&filter2.accesskey;" type="search"
+               id="Filter" oncommand="changeFilter();"/>
     </statusbarpanel>
   </statusbar>
 </window>