Merge branch 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 27 Dec 2010 21:59:48 +0000 (22:59 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 27 Dec 2010 21:59:48 +0000 (22:59 +0100)
* 'spice.v23.pull' of git://anongit.freedesktop.org/spice/qemu:
  vnc/spice: add set_passwd monitor command.
  vnc: support password expire
  vnc: auth reject cleanup
  spice: add qmp 'query-spice' and hmp 'info spice' commands.
  spice: connection events.
  spice: add qxl device
  spice: add qxl vgabios binary.

1  2 
Makefile.target
hmp-commands.hx
hw/pc.c
monitor.c
qemu-common.h
qemu-options.hx
qmp-commands.hx
sysemu.h
vl.c

diff --cc Makefile.target
Simple merge
diff --cc hmp-commands.hx
Simple merge
diff --cc hw/pc.c
Simple merge
diff --cc monitor.c
Simple merge
diff --cc qemu-common.h
Simple merge
diff --cc qemu-options.hx
Simple merge
diff --cc qmp-commands.hx
Simple merge
diff --cc sysemu.h
Simple merge
diff --cc vl.c
Simple merge