Fix entity typo that caused bustage. a=bustage
authorFrank Yan <fyan@mozilla.com>
Wed, 01 Dec 2010 02:39:32 -0800
changeset 58435 d1228efe31dd443de570c4570ee848bb8514949e
parent 58434 90cbd8bf83e20f2a1b6e8f3b26ca1c11271266d1
child 58436 ee61ea93a2faf4f5da1f58d2eaf0c87fe1e47ecc
push id17294
push userfyan@mozilla.com
push dateWed, 01 Dec 2010 10:41:05 +0000
treeherdermozilla-central@d1228efe31dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
milestone2.0b8pre
first release with
nightly win64
d1228efe31dd / 4.0b8pre / 20101201045207 / files
nightly linux32
nightly linux64
nightly mac
nightly win32
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly win64
Fix entity typo that caused bustage. a=bustage
browser/base/content/browser-menubar.inc
testing/tools/profiles/createTestingProfile.py
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -559,17 +559,17 @@
                         accesskey="&clearRecentHistory.accesskey;"
                         label="&clearRecentHistory.label;"
                         key="key_sanitize"
                         command="Tools:Sanitize"/>
 #ifndef XP_UNIX
               <menuseparator id="prefSep"/>
               <menuitem id="menu_preferences"
                         label="&preferencesCmd2.label;"
-                        accesskey="&preferencesCmd.accesskey;"
+                        accesskey="&preferencesCmd2.accesskey;"
                         oncommand="openPreferences();"/>
 #endif
               </menupopup>
             </menu>
 
 #ifdef XP_MACOSX
           <menu id="windowMenu" />
 #endif
--- a/testing/tools/profiles/createTestingProfile.py
+++ b/testing/tools/profiles/createTestingProfile.py
@@ -17,17 +17,16 @@ userPrefs = {
     'browser.tabs.warnOnClose': 'false',
     'browser.warnOnQuit': 'false',
     'dom.allow_scripts_to_close_windows': 'true',
     'dom.disable_open_during_load': 'false',
     'dom.disable_window_flip': 'false',
     'dom.disable_window_move_resize': 'false',
     'layout.fire_onload_after_image_background_loads': 'true',
     'javascript.options.showInConsole': 'true',
-    'privacy.popups.firstTime': 'false',
     'layout.debug.enable_data_xbl': 'true',
     'shell.checkDefaultClient': 'false',
     'browser.EULA.override': 'true'
 }
 
 def usage():
     print "python " + sys.argv[0] + " --binary=binary_location [--profileName=default] [--clobber] [--help]"