]> xenbits.xen.org Git - xenclient/ioemu.git/commit
projects / xenclient / ioemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f2b74a f7dd59a)
Merge branch 'stefano.display-changes'
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 13 Mar 2009 12:30:22 +0000 (12:30 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Fri, 13 Mar 2009 12:30:22 +0000 (12:30 +0000)
commit48b652c1f3dfc450a7b4522f538901774927ea6e
tree160adf7dcd5174d75d3b68fb9826cb04a60382d5tree
parent9f2b74a123c63c57b7f38cafe65eddb096f46c72commit | diff
parentf7dd59a4d7d0b161780ed90bb0eccb2a5fbd555ecommit | diff
Merge branch 'stefano.display-changes'

Conflicts:

curses.c
hw/cirrus_vga.c
hw/g364fb.c
hw/g364fb_template.h
hw/integratorcp.c
hw/jazz_led.c
hw/mips.h
hw/mips_jazz.c
hw/musicpal.c
hw/nseries.c
hw/omap_lcdc.c
hw/palm.c
hw/pc.h
hw/pl110.c
hw/ppc_oldworld.c
hw/sun4m.c
hw/vmware_vga.c
qemu-char.h
qemu-common.h
vl.c
vnchextile.h
console.c diff1 | diff2 | blob | history
hw/pc.h diff1 | diff2 | blob | history
hw/vmware_vga.c diff1 | diff2 | blob | history
hw/xen_machine_fv.c diff1 | diff2 | blob | history
hw/xen_machine_pv.c diff1 | diff2 | blob | history
qemu-common.h diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
vnchextile.h diff1 | diff2 | blob | history
xenclient ioemu repository