diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-11-28 23:10:30 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-11-28 23:10:30 +0100 |
| commit | 088c3cf890cc2d96f2093e2116612cbf65bfaeea (patch) | |
| tree | b4d3c68155f2de43432dd00c167d3029732be146 /config | |
| parent | ec3829bf7266ebec111f41268c6c491356576df1 (diff) | |
| parent | fe11e14d3cfc2900facf152257acda87280b6cdc (diff) | |
| download | UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.gz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.lz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.tar.xz UXP-088c3cf890cc2d96f2093e2116612cbf65bfaeea.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'config')
| -rw-r--r-- | config/external/nss/nss.symbols | 1 | ||||
| -rw-r--r-- | config/milestone.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index 3239d3119..7a968b6c8 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -165,7 +165,6 @@ DER_GeneralizedTimeToTime DER_GeneralizedTimeToTime_Util DER_GetInteger DER_GetInteger_Util -DER_Lengths DER_SetUInteger DER_UTCTimeToTime_Util DSAU_DecodeDerSigToLen diff --git a/config/milestone.txt b/config/milestone.txt index 03c9bebfc..752d23fca 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.1.6 +4.1.7 |