Ben Barham 05d62155f8 Merge remote-tracking branch 'origin/main' into manual-main-20240814 ...

Conflicts:
  - `include/swift/Localization/LocalizationFormat.h`
  - `lib/ClangImporter/SwiftLookupTable.cpp`
  - `lib/ClangImporter/SwiftLookupTable.h`
  - `lib/Serialization/ModuleFormat.h`
  - `lib/Serialization/Serialization.cpp`

All from the hash changes being added to main. Took main except for the
lookup table minor version, which needs to be bumped still because of
other changes.

2024-08-14 19:21:52 -07:00

78 KiB

Raw Permalink Blame History

View Raw