Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge fx-team to mozilla-central

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-04-07 13:37:38 +02:00
commit 866ee03bc2
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/browser-menubar.inc
View File

@ -73,7 +73,7 @@
accesskey="&emailPageCmd.accesskey;" accesskey="&emailPageCmd.accesskey;"
command="Browser:SendLink"/> command="Browser:SendLink"/>
<menuseparator/> <menuseparator/>
#ifndef XP_LINUX #if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
<menuitem id="menu_printSetup" <menuitem id="menu_printSetup"
label="&printSetupCmd.label;" label="&printSetupCmd.label;"
accesskey="&printSetupCmd.accesskey;" accesskey="&printSetupCmd.accesskey;"

1
content/base/test/test_bug431701.html
View File

@ -4,6 +4,7 @@
https://bugzilla.mozilla.org/show_bug.cgi?id=431701 https://bugzilla.mozilla.org/show_bug.cgi?id=431701
--> -->
<head> <head>
<meta charset="windows-1252">
<title>Test for Bug 431701</title> <title>Test for Bug 431701</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />

2
testing/mochitest/server.js
View File

@ -678,7 +678,7 @@ function testListing(metadata, response)
function defaultDirHandler(metadata, response) function defaultDirHandler(metadata, response)
{ {
response.setStatusLine("1.1", 200, "OK"); response.setStatusLine("1.1", 200, "OK");
response.setHeader("Content-type", "text/html", false); response.setHeader("Content-type", "text/html;charset=utf-8", false);
try { try {
if (metadata.path.indexOf("/tests") != 0) { if (metadata.path.indexOf("/tests") != 0) {
regularListing(metadata, response); regularListing(metadata, response);