diff options
author | Avi Kivity <avi@redhat.com> | 2009-09-09 12:17:20 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-09-09 12:17:20 +0300 |
commit | 3191c35929a3d06e959f3b8740228170ed530dec (patch) | |
tree | fa791635f79fdc1b7ff12971ed558aefd5898a8b /pc-bios/bios-pq/HEAD | |
parent | Merge commit 'f7188bbea7aa83ff7def23f7fcd03b8fdafc6066' into upstream-merge (diff) | |
parent | monitor: Port handler_3 to use QDict (diff) | |
download | qemu-kvm-3191c35929a3d06e959f3b8740228170ed530dec.tar.gz qemu-kvm-3191c35929a3d06e959f3b8740228170ed530dec.tar.bz2 qemu-kvm-3191c35929a3d06e959f3b8740228170ed530dec.zip |
Merge commit '1d4daa91ff0b77e86b3944faf8fc7f978cf51c84' into upstream-merge
* commit '1d4daa91ff0b77e86b3944faf8fc7f978cf51c84':
monitor: Port handler_3 to use QDict
monitor: Port handler_2 to use QDict
monitor: Port handler_1 to use QDict
monitor: Port handler_0 to use QDict
monitor: Export QDict header
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios/bios-pq/HEAD')
0 files changed, 0 insertions, 0 deletions