From: Anthony Liguori Date: Tue, 16 Apr 2013 15:28:43 +0000 (-0500) Subject: Merge remote-tracking branch 'kraxel/pixman.v11' into staging X-Git-Tag: v1.5.0-rc0~251 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=100c533220d70ae9732ba63142d71d1c48688f54 Merge remote-tracking branch 'kraxel/pixman.v11' into staging # By Gerd Hoffmann (22) and Igor Mitsyanko (2) # Via Gerd Hoffmann * kraxel/pixman.v11: (24 commits) qxl: register QemuConsole for secondary cards gtk: custom cursor support console: allow pinning displaychangelisteners to consoles console: add qemu_console_is_* xen: re-enable refresh interval reporting for xenfb console: gui timer fixes console: add GraphicHwOps console: make DisplayState private to console.c console: move gui_update+gui_setup_refresh from vl.c into console.c console: zap g_width + g_height console: simplify screendump console: give each QemuConsole its own DisplaySurface console: rename vga_hw_*, add QemuConsole param console: displaystate init revamp console: add trace events console: switch color_table_rgb to pixman_color_t console: use pixman for font rendering console: use pixman for fill+blit pixman: render vgafont glyphs into pixman images pixman: add qemu_pixman_color() ... Message-id: 1366105178-26744-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori --- 100c533220d70ae9732ba63142d71d1c48688f54