diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:25:15 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:26:16 +0200 |
| commit | 202296d02aa99afa90581333ab059c050b9c3ade (patch) | |
| tree | 6ed8a1289bed1bb06d2703ea77cba5fccd3bdffa /config | |
| parent | 1530f48c27fb13d7cbd2708c9f0fcf2dabc6ed6a (diff) | |
| parent | ab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff) | |
| download | UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.gz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.lz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.xz UXP-202296d02aa99afa90581333ab059c050b9c3ade.zip | |
Pull Basilisk-release forward.
Diffstat (limited to 'config')
| -rw-r--r-- | config/check_spidermonkey_style.py | 4 | ||||
| -rw-r--r-- | config/external/icu/data/icudt58l.dat | bin | 10912528 -> 11695584 bytes | |||
| -rw-r--r-- | config/milestone.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/check_spidermonkey_style.py b/config/check_spidermonkey_style.py index 647f403c4..3b5f20037 100644 --- a/config/check_spidermonkey_style.py +++ b/config/check_spidermonkey_style.py @@ -63,7 +63,7 @@ included_inclnames_to_ignore = set([ 'devtools/Instruments.h', # we ignore devtools/ in general 'double-conversion.h', # strange MFBT case 'javascript-trace.h', # generated in $OBJDIR if HAVE_DTRACE is defined - 'jsautokw.h', # generated in $OBJDIR + 'frontend/ReservedWordsGenerated.h', # generated in $OBJDIR 'jscustomallocator.h', # provided by embedders; allowed to be missing 'js-config.h', # generated in $OBJDIR 'fdlibm.h', # fdlibm @@ -99,7 +99,7 @@ included_inclnames_to_ignore = set([ # ignore #includes of them when checking #include ordering. oddly_ordered_inclnames = set([ 'ctypes/typedefs.h', # Included multiple times in the body of ctypes/CTypes.h - 'jsautokw.h', # Included in the body of frontend/TokenStream.h + 'frontend/ReservedWordsGenerated.h', # Included in the body of frontend/TokenStream.h 'jswin.h', # Must be #included before <psapi.h> 'machine/endian.h', # Must be included after <sys/types.h> on BSD 'winbase.h', # Must precede other system headers(?) diff --git a/config/external/icu/data/icudt58l.dat b/config/external/icu/data/icudt58l.dat Binary files differindex 2cba52d5b..528ff5ebe 100644 --- a/config/external/icu/data/icudt58l.dat +++ b/config/external/icu/data/icudt58l.dat diff --git a/config/milestone.txt b/config/milestone.txt index cf45e1d05..67b4fdd4e 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.2.1 +4.4.1
\ No newline at end of file |