mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Manual Resolved Conflicts: Changelog.md * Updated changelog test/externalTests/ens.sh * Merged fixes for upstream from both develop and breaking test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol * Removed in #11735 (breaking) test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol * Removed in #12209 (breaking) test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol * Removed in #11843 (breaking) test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol * Removed in #11843 (breaking) test/libsolidity/syntaxTests/inlineAssembly/basefee_berlin_function.sol * Used version of file from #11842 (breaking) |
||
---|---|---|
.. | ||
abstract-contracts.rst | ||
constant-state-variables.rst | ||
creating-contracts.rst | ||
errors.rst | ||
events.rst | ||
function-modifiers.rst | ||
functions.rst | ||
inheritance.rst | ||
interfaces.rst | ||
libraries.rst | ||
using-for.rst | ||
visibility-and-getters.rst |