summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-08 10:57:25 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-08 10:57:25 +0100
commit6b342cc9c872e82620fdd32730cd92affa8a19b3 (patch)
treeb2550c7d42449af6e316a509c28d233140c1ef97 /Makefile
parentff788b6fe67f694666781f821c1af812e8c7999b (diff)
parenta76a2f729aae21c45c7e9eef8d1d80e94d1cc930 (diff)
downloadqemu-6b342cc9c872e82620fdd32730cd92affa8a19b3.tar.gz
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-7' into staging
spice: small fixes # gpg: Signature made Thu 08 May 2014 09:50:21 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" * remotes/spice/tags/pull-spice-7: spice: fix libvirt snapshots spice: fix "info spice" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions