summary refs log tree commit diff stats
path: root/scripts/nsis.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-11-17 21:06:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-11-17 21:06:58 +0000
commit84dae210506784945ec8342a613d7bd62ae6ec62 (patch)
tree0f85638c786f7f11ff9cd1305ea3ade9b76e6544 /scripts/nsis.py
parentc446ac37b7e79d971e55b3423981ada0c3db6459 (diff)
parent922d42bb0d08c154602dd9112da00d22d2b46579 (diff)
downloadfocaccia-qemu-84dae210506784945ec8342a613d7bd62ae6ec62.tar.gz
focaccia-qemu-84dae210506784945ec8342a613d7bd62ae6ec62.zip
Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2020-11-17' into staging
QObject patches patches for 2020-11-17

# gpg: Signature made Tue 17 Nov 2020 14:41:06 GMT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qobject-2020-11-17:
  json: Fix a memleak in parse_pair()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/nsis.py')
0 files changed, 0 insertions, 0 deletions