зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to autoland on a CLOSED TREE
This commit is contained in:
Коммит
5fd82d4d7d
2
.hgtags
2
.hgtags
|
@ -185,3 +185,5 @@ e4b11f027efc1f8c2710ae3f52487a8f10a8fb39 FIREFOX_BETA_78_BASE
|
||||||
702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_END
|
702ad0fa15860f6ea37effdcb45973cc63d3125b FIREFOX_NIGHTLY_78_END
|
||||||
921a30cac33b6d0760f318b6f1a2e3ce1bd687cc FIREFOX_BETA_79_BASE
|
921a30cac33b6d0760f318b6f1a2e3ce1bd687cc FIREFOX_BETA_79_BASE
|
||||||
4c7e22cb6a476089657b971f2ebe333c5649a4a9 FIREFOX_NIGHTLY_79_END
|
4c7e22cb6a476089657b971f2ebe333c5649a4a9 FIREFOX_NIGHTLY_79_END
|
||||||
|
798bdad605b985a71cd204a56bb816dea503d432 FIREFOX_BETA_80_BASE
|
||||||
|
e8d1d9067328f6929a618c67f5d1e83cd9a4858f FIREFOX_NIGHTLY_80_END
|
||||||
|
|
2
CLOBBER
2
CLOBBER
|
@ -22,4 +22,4 @@
|
||||||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||||
# don't change CLOBBER for WebIDL changes any more.
|
# don't change CLOBBER for WebIDL changes any more.
|
||||||
|
|
||||||
build system regards file as missing which got moved in bug 1618465
|
Merge day clobber
|
|
@ -1 +1 @@
|
||||||
80.0a1
|
81.0a1
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
80.0a1
|
81.0a1
|
||||||
|
|
|
@ -10,4 +10,4 @@
|
||||||
# hardcoded milestones in the tree from these two files.
|
# hardcoded milestones in the tree from these two files.
|
||||||
#--------------------------------------------------------
|
#--------------------------------------------------------
|
||||||
|
|
||||||
80.0a1
|
81.0a1
|
||||||
|
|
|
@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [];
|
||||||
for (let [key, val] of Object.entries({
|
for (let [key, val] of Object.entries({
|
||||||
// Don't manually modify this line, as it is automatically replaced on merge day
|
// Don't manually modify this line, as it is automatically replaced on merge day
|
||||||
// by the gecko_migration.py script.
|
// by the gecko_migration.py script.
|
||||||
WEAVE_VERSION: "1.82.0",
|
WEAVE_VERSION: "1.83.0",
|
||||||
|
|
||||||
// Sync Server API version that the client supports.
|
// Sync Server API version that the client supports.
|
||||||
SYNC_API_VERSION: "1.5",
|
SYNC_API_VERSION: "1.5",
|
||||||
|
|
|
@ -21,7 +21,7 @@ namespace mozilla {
|
||||||
* via a module loader.
|
* via a module loader.
|
||||||
*/
|
*/
|
||||||
struct Module {
|
struct Module {
|
||||||
static const unsigned int kVersion = 80;
|
static const unsigned int kVersion = 81;
|
||||||
|
|
||||||
struct CIDEntry;
|
struct CIDEntry;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче