зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to autoland, a=merge
This commit is contained in:
Коммит
64fba0f0c0
1
.hgtags
1
.hgtags
|
@ -127,3 +127,4 @@ fcef8ded82219c89298b4e376cfbdfba79a1d35a FIREFOX_AURORA_43_BASE
|
|||
68d3781deda0d4d58ec9877862830db89669b3a5 FIREFOX_AURORA_47_BASE
|
||||
1c6385ae1fe7e37d8f23f958ce14582f07af729e FIREFOX_AURORA_48_BASE
|
||||
d98f20c25feeac4dd7ebbd1c022957df1ef58af4 FIREFOX_AURORA_49_BASE
|
||||
465d150bc8be5bbf9f02a8607d4552b6a5e1697c FIREFOX_AURORA_50_BASE
|
||||
|
|
2
CLOBBER
2
CLOBBER
|
@ -22,4 +22,4 @@
|
|||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||
# don't change CLOBBER for WebIDL changes any more.
|
||||
|
||||
Bug 1287827 - Clobber needed because this patch removes files, second landing AND Bug 1272693 - Clobber required to rebuild NSS.
|
||||
Merge day clobber
|
|
@ -1 +1 @@
|
|||
50.0a1
|
||||
51.0a1
|
||||
|
|
|
@ -1 +1 @@
|
|||
50.0a1
|
||||
51.0a1
|
||||
|
|
|
@ -10,4 +10,4 @@
|
|||
# hardcoded milestones in the tree from these two files.
|
||||
#--------------------------------------------------------
|
||||
|
||||
50.0a1
|
||||
51.0a1
|
||||
|
|
|
@ -45,7 +45,7 @@ EXTRA_PP_JS_MODULES['services-sync'] += [
|
|||
]
|
||||
|
||||
# Definitions used by constants.js
|
||||
DEFINES['weave_version'] = '1.52.0'
|
||||
DEFINES['weave_version'] = '1.53.0'
|
||||
DEFINES['weave_id'] = '{340c2bbc-ce74-4362-90b5-7c26312808ef}'
|
||||
|
||||
EXTRA_JS_MODULES['services-sync'].engines += [
|
||||
|
|
|
@ -22,7 +22,7 @@ namespace mozilla {
|
|||
*/
|
||||
struct Module
|
||||
{
|
||||
static const unsigned int kVersion = 50;
|
||||
static const unsigned int kVersion = 51;
|
||||
|
||||
struct CIDEntry;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче