diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-06-06 23:38:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-06 23:38:29 +0200 |
| commit | 83421cd06f8aeacc69d666e0e695333fdaa80377 (patch) | |
| tree | 58a9c005ef6f029f8884120a4f1b6dee5bb9b008 /doc/classes | |
| parent | 8fb004efbc6161d2adec9501c08cfc9a910086f6 (diff) | |
| parent | a0915e6dee4e54563a98ca6adb8968dbdcea1af1 (diff) | |
Merge pull request #59883 from KoBeWi/merge_this
Diffstat (limited to 'doc/classes')
| -rw-r--r-- | doc/classes/Dictionary.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/classes/Dictionary.xml b/doc/classes/Dictionary.xml index b46719c758..6f2ad5205c 100644 --- a/doc/classes/Dictionary.xml +++ b/doc/classes/Dictionary.xml @@ -291,6 +291,14 @@ Returns the list of keys in the [Dictionary]. </description> </method> + <method name="merge"> + <return type="void" /> + <argument index="0" name="dictionary" type="Dictionary" /> + <argument index="1" name="overwrite" type="bool" default="false" /> + <description> + Adds elements from [code]dictionary[/code] to this [Dictionary]. By default, duplicate keys will not be copied over, unless [code]overwrite[/code] is [code]true[/code]. + </description> + </method> <method name="size" qualifiers="const"> <return type="int" /> <description> |