]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83199ca b456677)
Merge remote-tracking branch 'kraxel/bios.2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:32 +0000 (14:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 18 Jul 2012 19:44:32 +0000 (14:44 -0500)
* kraxel/bios.2:
  Add vgabios build rules to roms/Makefile


Trivial merge
Qemu copy for testing