Anthony Liguori 96b3d73f5a Merge remote-tracking branch 'qmp/queue/qmp' into staging ... Conflicts: ui/spice-core.c		2011-10-31 11:02:29 -05:00
..
cocoa.m
curses.c
curses_keys.h
d3des.c
d3des.h
keymaps.c	use qemu_* ctype functions	2011-09-21 11:10:52 +01:00
keymaps.h
qemu-spice.h	spice: turn client_migrate_info to async	2011-10-25 14:00:53 +02:00
sdl.c	Drop the vm_running global variable	2011-09-15 16:39:32 -03:00
sdl_keysym.h
sdl_zoom.c
sdl_zoom.h
sdl_zoom_template.h
spice-core.c	Merge remote-tracking branch 'qmp/queue/qmp' into staging	2011-10-31 11:02:29 -05:00
spice-display.c	Drop unneeded pthread.h inclusions	2011-09-21 10:49:16 +01:00
spice-display.h	Replace the VMSTOP macros with a proper state type	2011-09-15 16:39:32 -03:00
spice-input.c
vnc-auth-sasl.c
vnc-auth-sasl.h
vnc-auth-vencrypt.c
vnc-auth-vencrypt.h
vnc-enc-hextile-template.h
vnc-enc-hextile.c
vnc-enc-tight.c
vnc-enc-tight.h
vnc-enc-zlib.c
vnc-enc-zrle-template.c
vnc-enc-zrle.c
vnc-enc-zrle.h
vnc-enc-zywrle-template.c
vnc-enc-zywrle.h
vnc-jobs-async.c
vnc-jobs-sync.c
vnc-jobs.h
vnc-palette.c
vnc-palette.h
vnc-tls.c	vns/tls: don't use depricated gnutls functions	2011-09-09 12:58:17 -05:00
vnc-tls.h
vnc.c	qapi: Convert query-vnc	2011-10-27 11:48:47 -02:00
vnc.h
vnc_keysym.h
x_keymap.c
x_keymap.h