| commit | 09f2ab1bd148ace3ddc594e72dd998db581d91f4 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 08:53:19 +0000 (11 09:53 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:22:11 +0000 (11 10:22 +0100) | ||
| tree | 3fc4a90bd4ff668c328d09ee6b09ad794056a1bf | treesnapshot (tar.gz zip) |
| parent | b6810dec0ea5c9e90e90404424458918972853d8 | commitdiff |
| parent | 5cea8590eaa099be8087f363f80d0e6917382385 | commitdiff |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (1 commit)
Use relative path for bios
Conflicts:
hw/pc.c
vl.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* 'master' of git://git.sv.gnu.org/qemu: (1 commit)
Use relative path for bios
Conflicts:
hw/pc.c
vl.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |