Merge mozilla-inbound to mozilla-central. a=merge
authorAndreea Pavel <apavel@mozilla.com>
Sun, 04 Nov 2018 23:43:17 +0200
changeset 500774 04b755bbff84
parent 500771 30f7c1c68f9b (current diff)
parent 500773 89e66016323e (diff)
child 500779 abc0eec483f9
child 500792 5d4e3be63538
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone65.0a1
first release with
nightly linux32
04b755bbff84 / 65.0a1 / 20181104220100 / files
nightly linux64
04b755bbff84 / 65.0a1 / 20181104220100 / files
nightly mac
04b755bbff84 / 65.0a1 / 20181104220100 / files
nightly win32
04b755bbff84 / 65.0a1 / 20181104220100 / files
nightly win64
04b755bbff84 / 65.0a1 / 20181104220100 / 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 mozilla-inbound to mozilla-central. a=merge
--- a/layout/xul/nsRepeatService.h
+++ b/layout/xul/nsRepeatService.h
@@ -7,16 +7,17 @@
 //
 // nsRepeatService
 //
 #ifndef nsRepeatService_h__
 #define nsRepeatService_h__
 
 #include "nsCOMPtr.h"
 #include "nsITimer.h"
+#include "nsString.h"
 
 #define INITAL_REPEAT_DELAY 250
 
 #ifdef XP_MACOSX
 #define REPEAT_DELAY        25
 #else
 #define REPEAT_DELAY        50
 #endif
--- a/taskcluster/scripts/misc/build-cbindgen.sh
+++ b/taskcluster/scripts/misc/build-cbindgen.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -x -e -v
 
 # If you update this, make sure to update the minimum version in
-# build/moz.configure/rust.configure and python/mozboot/mozboot/osx.py as well.
+# build/moz.configure/rust.configure as well.
 CBINDGEN_VERSION=v0.6.7
 TARGET="$1"
 
 case "$(uname -s)" in
 Linux)
     WORKSPACE=$HOME/workspace
     UPLOAD_DIR=$HOME/artifacts
     COMPRESS_EXT=xz