summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAnthony Liguori2011-02-01 22:22:48 +0100
committerAnthony Liguori2011-02-01 22:22:48 +0100
commit9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (patch)
tree77c55ab45310cbeced2a05e1f85a109bf2efd481 /scripts
parentMerge remote branch 'spice/usb.5' into staging (diff)
parentspice: add chardev (v5) (diff)
downloadqemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.tar.gz
qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.tar.xz
qemu-9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4.zip
Merge remote branch 'spice/spice.v29.pull' into staging
Conflicts: trace-events
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions