| commit | 7ff976b060ecbaf5caccac3963c83fab8414a94a | |
| author | Avi Kivity <avi@qumranet.com> | |
| Sun, 10 Aug 2008 13:06:45 +0000 (10 16:06 +0300) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Sun, 10 Aug 2008 13:06:45 +0000 (10 16:06 +0300) | ||
| tree | ffdc4c46ff60189e6cdef8a2e75b4a62c61cfa25 | treesnapshot (tar.gz zip) |
| parent | 843489f1232203e3c35d750938548a0e67771c50 | commitdiff |
| parent | 06057e6f6ce06b92d552a851a91f9d6ca250970c | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/configure
qemu/console.h
qemu/hw/e1000.c
qemu/monitor.c
qemu/sdl.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Conflicts:
qemu/Makefile
qemu/Makefile.target
qemu/configure
qemu/console.h
qemu/hw/e1000.c
qemu/monitor.c
qemu/sdl.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
18 files changed: