| commit | 9411db8f37c64b9adb3e4b393c623a5760bcb847 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 11 Jul 2019 10:58:14 +0000 (11 11:58 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Thu, 11 Jul 2019 10:58:14 +0000 (11 11:58 +0100) | ||
| tree | 2aecb86acc40515e47d525425de900a79c1046cb | treesnapshot (tar.gz zip) |
| parent | abd45ff0396cb139e4f069fc39d1893d6c141d18 | commitdiff |
| parent | a7786bfb0effe0b4b0fc61d8a8cd307c0b739ed7 | commitdiff |
Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging
Pull request
# gpg: Signature made Wed 10 Jul 2019 20:21:58 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/bitmaps-pull-request:
docs/bitmaps: use QMP lexer instead of json
sphinx: add qmp_lexer
docs/interop/bitmaps.rst: Fix typos
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Pull request
# gpg: Signature made Wed 10 Jul 2019 20:21:58 BST
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/bitmaps-pull-request:
docs/bitmaps: use QMP lexer instead of json
sphinx: add qmp_lexer
docs/interop/bitmaps.rst: Fix typos
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>