From: Avi Kivity <[EMAIL PROTECTED]>

Conflicts:

        qemu/Makefile
        qemu/Makefile.target
        qemu/configure
        qemu/cpu-all.h
        qemu/cpu-exec.c
        qemu/exec.c
        qemu/hw/boards.h
        qemu/hw/pc.c
        qemu/hw/vga.c
        qemu/monitor.c
        qemu/osdep.c
        qemu/pc-bios/bios.bin
        qemu/sysemu.h
        qemu/vl.c

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to