diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2013-01-10 21:52:28 +0100 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2013-01-10 21:52:28 +0100 |
| commit | 63e3555e80c31776285accbb4d0c14ae91c457dc (patch) | |
| tree | 89907c82724d6519c8bbad7acc15c0198c6f902f /pc-bios/bios.bin | |
| parent | 52a71bff6085398fbb8602718af228cd6339c02d (diff) | |
| parent | a6308bc2224db238e72c570482717b68246a7ce0 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into prep-up
Conflicts:
hw/Makefile.objs
hw/ppc_prep.c
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Diffstat (limited to 'pc-bios/bios.bin')
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex eac67cb05a..3910875311 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin |