diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-23 21:04:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-23 21:04:53 +0100 |
| commit | 518d23a976b7dad77cfef3e41c3531ac89229b00 (patch) | |
| tree | 1e46fe91e074b9c05fb5445e2703dee86b0fc1cc /hw | |
| parent | f28d0dfdce5754d80d2a5993fff2f5312b32cac1 (diff) | |
| parent | bf20b675cc5a2568f1105c3577663978c5a13108 (diff) | |
Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging
Python queue, 2018-06-22
* Partially revert commit that broke qmp-shell and other scripts
inside ./scripts/qmp
# gpg: Signature made Fri 22 Jun 2018 19:47:23 BST
# gpg: using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF D1AA 2807 936F 984D C5A6
* remotes/ehabkost/tags/python-next-pull-request:
Partially revert "python: futurize -f libfuturize.fixes.fix_absolute_import"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
0 files changed, 0 insertions, 0 deletions