| commit | f6f8864b9b3ae1ea151c2b781792a5e72baaa178 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 2 Dec 2010 13:51:26 +0000 (2 11:51 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 2 Dec 2010 13:51:26 +0000 (2 11:51 -0200) | ||
| tree | 737905f20974e9e383631d19e5c8d734bba8381c | treesnapshot (tar.gz zip) |
| parent | bdce0cb95bc07c2d0585210a4fe42f3c9c437a6b | commitdiff |
| parent | 3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4 | commitdiff |
Merge commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4' into upstream-merge
* commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4':
Add new vgabios binaries to blobs list.
Conflicts:
pc-bios/vgabios-cirrus.bin
pc-bios/vgabios.bin
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4':
Add new vgabios binaries to blobs list.
Conflicts:
pc-bios/vgabios-cirrus.bin
pc-bios/vgabios.bin
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>