summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2011-01-06 18:57:47 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2011-01-06 18:57:47 -0200
commit5e10257364dd653cae26eb61b699f8562f445d4d (patch)
tree0f20c72700c0c208baf224c9bbcf4931702b6d7a /Makefile
parentd65356c9b59a1894aede7fa37e7fda2859bd3215 (diff)
parenta19cbfb346425cc760ed19b4e746417df636b761 (diff)
Merge commit 'a19cbfb346425cc760ed19b4e746417df636b761' into upstream-merge
* commit 'a19cbfb346425cc760ed19b4e746417df636b761': spice: add qxl device spice: add qxl vgabios binary. Conflicts: Makefile.target Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 59b5a409a..87195af04 100644
--- a/Makefile
+++ b/Makefile
@@ -205,7 +205,7 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
ifdef INSTALL_BLOBS
BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \
-vgabios-stdvga.bin vgabios-vmware.bin \
+vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \
gpxe-eepro100-80861209.rom \
pxe-e1000.bin \