Merge fx-team to m-c

This commit is contained in:
Wes Kocher 2014-05-08 18:54:27 -07:00
commit 257d8a5be7
2 changed files with 1 additions and 2 deletions

View File

@ -808,7 +808,6 @@
list-style-image: url("chrome://browser/skin/devtools/vview-edit.png");
-moz-image-region: rect(0,16px,16px,0);
cursor: pointer;
padding-left: 2px;
}
.variables-view-edit:hover {

View File

@ -471,7 +471,7 @@ let Impl = {
// sysinfo fields are not always available, get what we can.
let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
let fields = ["cpucount", "memsize", "arch", "version", "kernel_version",
"device", "manufacturer", "hardware",
"device", "manufacturer", "hardware", "tablet",
"hasMMX", "hasSSE", "hasSSE2", "hasSSE3",
"hasSSSE3", "hasSSE4A", "hasSSE4_1", "hasSSE4_2",
"hasEDSP", "hasARMv6", "hasARMv7", "hasNEON", "isWow64",